From 4398c827ceb9801a5af43574999cd9c2ebc4be74 Mon Sep 17 00:00:00 2001
From: Kazuki Shimizu <kazuki43zoo@gmail.com>
Date: Sat, 17 Jun 2023 22:00:28 +0900
Subject: [PATCH 1/2] Support processPropertyPlaceHolders option in mapper:scan
 and @MapperScan

Fixes gh-829

(cherry picked from commit 76e8bae48771da0d765c28a84eed442e9640f382)
---
 .../mybatis/spring/annotation/MapperScan.java | 13 +++-
 .../annotation/MapperScannerRegistrar.java    |  4 +-
 .../MapperScannerBeanDefinitionParser.java    |  7 +-
 .../mybatis/spring/config/mybatis-spring.xsd  | 12 ++-
 .../spring/annotation/MapperScanTest.java     | 76 ++++++++++++++++++-
 .../org/mybatis/spring/annotation/MyBean.java | 37 +++++++++
 .../spring/annotation/override.properties     | 17 +++++
 .../spring/annotation/placeholders.properties | 17 +++++
 .../org/mybatis/spring/config/MyBean.java     | 37 +++++++++
 .../mybatis/spring/config/MyFactoryBean.java  | 30 ++++++++
 .../mybatis/spring/config/NamespaceTest.java  | 33 +++++++-
 .../mybatis/spring/config/override.properties | 17 +++++
 .../spring/config/placeholders.properties     | 17 +++++
 .../process-property-placeholders-false.xml   | 35 +++++++++
 .../process-property-placeholders-true.xml    | 36 +++++++++
 15 files changed, 380 insertions(+), 8 deletions(-)
 create mode 100644 src/test/java/org/mybatis/spring/annotation/MyBean.java
 create mode 100644 src/test/java/org/mybatis/spring/annotation/override.properties
 create mode 100644 src/test/java/org/mybatis/spring/annotation/placeholders.properties
 create mode 100644 src/test/java/org/mybatis/spring/config/MyBean.java
 create mode 100644 src/test/java/org/mybatis/spring/config/MyFactoryBean.java
 create mode 100644 src/test/java/org/mybatis/spring/config/override.properties
 create mode 100644 src/test/java/org/mybatis/spring/config/placeholders.properties
 create mode 100644 src/test/java/org/mybatis/spring/config/process-property-placeholders-false.xml
 create mode 100644 src/test/java/org/mybatis/spring/config/process-property-placeholders-true.xml

diff --git a/src/main/java/org/mybatis/spring/annotation/MapperScan.java b/src/main/java/org/mybatis/spring/annotation/MapperScan.java
index 78c0d9b0bf..9d51b7ce42 100644
--- a/src/main/java/org/mybatis/spring/annotation/MapperScan.java
+++ b/src/main/java/org/mybatis/spring/annotation/MapperScan.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2022 the original author or authors.
+ * 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.
@@ -185,4 +185,15 @@
    */
   String defaultScope() default AbstractBeanDefinition.SCOPE_DEFAULT;
 
+  /**
+   * Specifies a flag that whether execute a property placeholder processing or not.
+   * <p>
+   * The default is {@literal true}. This means that a property placeholder processing execute.
+   *
+   * @since 3.0.3
+   *
+   * @return a flag that whether execute a property placeholder processing or not
+   */
+  boolean processPropertyPlaceHolders() default true;
+
 }
diff --git a/src/main/java/org/mybatis/spring/annotation/MapperScannerRegistrar.java b/src/main/java/org/mybatis/spring/annotation/MapperScannerRegistrar.java
index cde801d739..fb8f1f94f6 100644
--- a/src/main/java/org/mybatis/spring/annotation/MapperScannerRegistrar.java
+++ b/src/main/java/org/mybatis/spring/annotation/MapperScannerRegistrar.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2022 the original author or authors.
+ * 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.
@@ -82,7 +82,7 @@ void registerBeanDefinitions(AnnotationMetadata annoMeta, AnnotationAttributes a
       BeanDefinitionRegistry registry, String beanName) {
 
     BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(MapperScannerConfigurer.class);
-    builder.addPropertyValue("processPropertyPlaceHolders", true);
+    builder.addPropertyValue("processPropertyPlaceHolders", annoAttrs.getBoolean("processPropertyPlaceHolders"));
 
     Class<? extends Annotation> annotationClass = annoAttrs.getClass("annotationClass");
     if (!Annotation.class.equals(annotationClass)) {
diff --git a/src/main/java/org/mybatis/spring/config/MapperScannerBeanDefinitionParser.java b/src/main/java/org/mybatis/spring/config/MapperScannerBeanDefinitionParser.java
index d0e40c5777..927cd627d6 100644
--- a/src/main/java/org/mybatis/spring/config/MapperScannerBeanDefinitionParser.java
+++ b/src/main/java/org/mybatis/spring/config/MapperScannerBeanDefinitionParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2022 the original author or authors.
+ * 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.
@@ -56,6 +56,7 @@ public class MapperScannerBeanDefinitionParser extends AbstractBeanDefinitionPar
   private static final String ATTRIBUTE_MAPPER_FACTORY_BEAN_CLASS = "mapper-factory-bean-class";
   private static final String ATTRIBUTE_LAZY_INITIALIZATION = "lazy-initialization";
   private static final String ATTRIBUTE_DEFAULT_SCOPE = "default-scope";
+  private static final String ATTRIBUTE_PROCESS_PROPERTY_PLACEHOLDERS = "process-property-placeholders";
 
   /**
    * {@inheritDoc}
@@ -68,7 +69,9 @@ protected AbstractBeanDefinition parseInternal(Element element, ParserContext pa
 
     ClassLoader classLoader = ClassUtils.getDefaultClassLoader();
 
-    builder.addPropertyValue("processPropertyPlaceHolders", true);
+    String processPropertyPlaceHolders = element.getAttribute(ATTRIBUTE_PROCESS_PROPERTY_PLACEHOLDERS);
+    builder.addPropertyValue("processPropertyPlaceHolders",
+        !StringUtils.hasText(processPropertyPlaceHolders) || Boolean.parseBoolean(processPropertyPlaceHolders));
     try {
       String annotationClassName = element.getAttribute(ATTRIBUTE_ANNOTATION);
       if (StringUtils.hasText(annotationClassName)) {
diff --git a/src/main/resources/org/mybatis/spring/config/mybatis-spring.xsd b/src/main/resources/org/mybatis/spring/config/mybatis-spring.xsd
index 1a3d5df381..5366717e4d 100644
--- a/src/main/resources/org/mybatis/spring/config/mybatis-spring.xsd
+++ b/src/main/resources/org/mybatis/spring/config/mybatis-spring.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2010-2022 the original author or authors.
+    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.
@@ -148,6 +148,16 @@
           </xsd:documentation>
         </xsd:annotation>
       </xsd:attribute>
+      <xsd:attribute name="process-property-placeholders" type="xsd:boolean">
+        <xsd:annotation>
+          <xsd:documentation>
+            <![CDATA[
+              Specifies a flag that whether execute a property placeholder processing or not. (Since 3.0.3)
+              The default is true. This means that a property placeholder processing execute.
+            ]]>
+          </xsd:documentation>
+        </xsd:annotation>
+      </xsd:attribute>
     </xsd:complexType>
   </xsd:element>
 </xsd:schema>
diff --git a/src/test/java/org/mybatis/spring/annotation/MapperScanTest.java b/src/test/java/org/mybatis/spring/annotation/MapperScanTest.java
index 85c1d5fdc8..51338fff0e 100644
--- a/src/test/java/org/mybatis/spring/annotation/MapperScanTest.java
+++ b/src/test/java/org/mybatis/spring/annotation/MapperScanTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2022 the original author or authors.
+ * 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.
@@ -46,6 +46,7 @@
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.config.ConstructorArgumentValues;
+import org.springframework.beans.factory.config.PropertyOverrideConfigurer;
 import org.springframework.beans.factory.config.RuntimeBeanReference;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
 import org.springframework.beans.factory.support.GenericBeanDefinition;
@@ -390,6 +391,32 @@ void testScopedProxyMapperScanByDefaultScope() {
     assertEquals(2, sqlSessionFactory.getConfiguration().getMapperRegistry().getMappers().size());
   }
 
+  @Test
+  void testProcessPropertyPlaceHoldersIsTrue() {
+    applicationContext.register(ProcessPropertyPlaceHoldersTrueConfiguration.class);
+
+    startContext();
+
+    SqlSessionFactory sqlSessionFactory = applicationContext.getBean(SqlSessionFactory.class);
+    assertEquals(1, sqlSessionFactory.getConfiguration().getMapperRegistry().getMappers().size());
+
+    MyBean myBean = applicationContext.getBean(MyBean.class);
+    assertThat(myBean.getName()).isEqualTo("MyBean!!");
+  }
+
+  @Test
+  void testProcessPropertyPlaceHoldersIsFalse() {
+    applicationContext.register(ProcessPropertyPlaceHoldersFalseConfiguration.class);
+
+    startContext();
+
+    SqlSessionFactory sqlSessionFactory = applicationContext.getBean(SqlSessionFactory.class);
+    assertEquals(1, sqlSessionFactory.getConfiguration().getMapperRegistry().getMappers().size());
+
+    MyBean myBean = applicationContext.getBean(MyBean.class);
+    assertThat(myBean.getName()).isEqualTo("MyBean!!");
+  }
+
   @Configuration
   @MapperScan("org.mybatis.spring.mapper")
   public static class AppConfigWithPackageScan {
@@ -459,6 +486,53 @@ static PropertySourcesPlaceholderConfigurer propertySourcesPlaceholderConfigurer
 
   }
 
+  @ComponentScan("org.mybatis.spring.annotation.factory")
+  @MapperScan(basePackages = "${scan-package}")
+  public static class ProcessPropertyPlaceHoldersTrueConfiguration {
+    @Bean
+    static PropertySourcesPlaceholderConfigurer propertySourcesPlaceholderConfigurer() {
+      PropertySourcesPlaceholderConfigurer configurer = new PropertySourcesPlaceholderConfigurer();
+      configurer.setLocation(new ClassPathResource("/org/mybatis/spring/annotation/placeholders.properties"));
+      return configurer;
+    }
+
+    @Bean
+    static PropertyOverrideConfigurer propertyOverrideConfigurer() {
+      PropertyOverrideConfigurer configurer = new PropertyOverrideConfigurer();
+      configurer.setLocation(new ClassPathResource("/org/mybatis/spring/annotation/override.properties"));
+      configurer.setIgnoreInvalidKeys(true);
+      return configurer;
+    }
+
+    @Bean
+    MyBean myBean() {
+      return new MyBean("annotation");
+    }
+  }
+
+  @ComponentScan("org.mybatis.spring.annotation.factory")
+  @MapperScan(basePackages = "org.mybatis.spring.annotation.mapper.ds1", processPropertyPlaceHolders = false)
+  public static class ProcessPropertyPlaceHoldersFalseConfiguration {
+    @Bean
+    static PropertySourcesPlaceholderConfigurer propertySourcesPlaceholderConfigurer() {
+      PropertySourcesPlaceholderConfigurer configurer = new PropertySourcesPlaceholderConfigurer();
+      configurer.setLocation(new ClassPathResource("/org/mybatis/spring/annotation/placeholders.properties"));
+      return configurer;
+    }
+
+    @Bean
+    static PropertyOverrideConfigurer propertyOverrideConfigurer() {
+      PropertyOverrideConfigurer configurer = new PropertyOverrideConfigurer();
+      configurer.setLocation(new ClassPathResource("/org/mybatis/spring/annotation/override.properties"));
+      return configurer;
+    }
+
+    @Bean
+    MyBean myBean() {
+      return new MyBean("annotation");
+    }
+  }
+
   @MapperScan(basePackages = "org.mybatis.spring.annotation.mapper.ds1", lazyInitialization = "${mybatis.lazy-initialization:false}")
   @PropertySource("classpath:/org/mybatis/spring/annotation/scan.properties")
   public static class LazyConfigWithPropertySource {
diff --git a/src/test/java/org/mybatis/spring/annotation/MyBean.java b/src/test/java/org/mybatis/spring/annotation/MyBean.java
new file mode 100644
index 0000000000..b6d234929f
--- /dev/null
+++ b/src/test/java/org/mybatis/spring/annotation/MyBean.java
@@ -0,0 +1,37 @@
+/*
+ * 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.
+ */
+package org.mybatis.spring.annotation;
+
+public class MyBean {
+  private String id;
+  private String name;
+
+  public MyBean(String id) {
+    this.id = id;
+  }
+
+  public String getId() {
+    return id;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  public String getName() {
+    return name;
+  }
+}
diff --git a/src/test/java/org/mybatis/spring/annotation/override.properties b/src/test/java/org/mybatis/spring/annotation/override.properties
new file mode 100644
index 0000000000..bfbb2c74a5
--- /dev/null
+++ b/src/test/java/org/mybatis/spring/annotation/override.properties
@@ -0,0 +1,17 @@
+#
+# 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.
+#
+
+myBean.name=MyBean!!
\ No newline at end of file
diff --git a/src/test/java/org/mybatis/spring/annotation/placeholders.properties b/src/test/java/org/mybatis/spring/annotation/placeholders.properties
new file mode 100644
index 0000000000..15d7a03c20
--- /dev/null
+++ b/src/test/java/org/mybatis/spring/annotation/placeholders.properties
@@ -0,0 +1,17 @@
+#
+# 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.
+#
+
+scan-package=org.mybatis.spring.annotation.mapper.ds1
diff --git a/src/test/java/org/mybatis/spring/config/MyBean.java b/src/test/java/org/mybatis/spring/config/MyBean.java
new file mode 100644
index 0000000000..c597da2455
--- /dev/null
+++ b/src/test/java/org/mybatis/spring/config/MyBean.java
@@ -0,0 +1,37 @@
+/*
+ * 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.
+ */
+package org.mybatis.spring.config;
+
+public class MyBean {
+  private String id;
+  private String name;
+
+  public MyBean(String id) {
+    this.id = id;
+  }
+
+  public String getId() {
+    return id;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  public String getName() {
+    return name;
+  }
+}
diff --git a/src/test/java/org/mybatis/spring/config/MyFactoryBean.java b/src/test/java/org/mybatis/spring/config/MyFactoryBean.java
new file mode 100644
index 0000000000..7227f811f4
--- /dev/null
+++ b/src/test/java/org/mybatis/spring/config/MyFactoryBean.java
@@ -0,0 +1,30 @@
+/*
+ * 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.
+ */
+package org.mybatis.spring.config;
+
+import org.springframework.beans.factory.FactoryBean;
+
+public class MyFactoryBean implements FactoryBean<MyBean> {
+  @Override
+  public MyBean getObject() {
+    return new MyBean("factory");
+  }
+
+  @Override
+  public Class<?> getObjectType() {
+    return MyBean.class;
+  }
+}
diff --git a/src/test/java/org/mybatis/spring/config/NamespaceTest.java b/src/test/java/org/mybatis/spring/config/NamespaceTest.java
index 404cfc9b39..3a6293d921 100644
--- a/src/test/java/org/mybatis/spring/config/NamespaceTest.java
+++ b/src/test/java/org/mybatis/spring/config/NamespaceTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2022 the original author or authors.
+ * 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.
@@ -271,6 +271,37 @@ void testDefaultScope() {
     assertEquals(2, sqlSessionFactory.getConfiguration().getMapperRegistry().getMappers().size());
   }
 
+  @Test
+  void processPropertyPlaceHoldersIsTrue() {
+
+    applicationContext = new ClassPathXmlApplicationContext(
+        new String[] { "org/mybatis/spring/config/process-property-placeholders-true.xml" }, setupSqlSessionTemplate());
+
+    startContext();
+
+    SqlSessionFactory sqlSessionFactory = applicationContext.getBean(SqlSessionFactory.class);
+    assertEquals(5, sqlSessionFactory.getConfiguration().getMapperRegistry().getMappers().size());
+
+    MyBean myBean = applicationContext.getBean("myBean", MyBean.class);
+    assertThat(myBean.getName()).isEqualTo("MyBean!!");
+  }
+
+  @Test
+  void processPropertyPlaceHoldersIsFalse() {
+
+    applicationContext = new ClassPathXmlApplicationContext(
+        new String[] { "org/mybatis/spring/config/process-property-placeholders-false.xml" },
+        setupSqlSessionTemplate());
+
+    startContext();
+
+    SqlSessionFactory sqlSessionFactory = applicationContext.getBean(SqlSessionFactory.class);
+    assertEquals(5, sqlSessionFactory.getConfiguration().getMapperRegistry().getMappers().size());
+
+    MyBean myBean = applicationContext.getBean("myBean", MyBean.class);
+    assertThat(myBean.getName()).isEqualTo("MyBean!!");
+  }
+
   private GenericApplicationContext setupSqlSessionTemplate() {
 
     GenericApplicationContext genericApplicationContext = setupSqlSessionFactory();
diff --git a/src/test/java/org/mybatis/spring/config/override.properties b/src/test/java/org/mybatis/spring/config/override.properties
new file mode 100644
index 0000000000..bfbb2c74a5
--- /dev/null
+++ b/src/test/java/org/mybatis/spring/config/override.properties
@@ -0,0 +1,17 @@
+#
+# 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.
+#
+
+myBean.name=MyBean!!
\ No newline at end of file
diff --git a/src/test/java/org/mybatis/spring/config/placeholders.properties b/src/test/java/org/mybatis/spring/config/placeholders.properties
new file mode 100644
index 0000000000..90503bc961
--- /dev/null
+++ b/src/test/java/org/mybatis/spring/config/placeholders.properties
@@ -0,0 +1,17 @@
+#
+# 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.
+#
+
+scan-package=org.mybatis.spring.mapper
diff --git a/src/test/java/org/mybatis/spring/config/process-property-placeholders-false.xml b/src/test/java/org/mybatis/spring/config/process-property-placeholders-false.xml
new file mode 100644
index 0000000000..3b7fdc9942
--- /dev/null
+++ b/src/test/java/org/mybatis/spring/config/process-property-placeholders-false.xml
@@ -0,0 +1,35 @@
+<?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.
+
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       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://mybatis.org/schema/mybatis-spring http://mybatis.org/schema/mybatis-spring.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
+
+  <context:property-placeholder location="classpath:/org/mybatis/spring/config/placeholders.properties"/>
+  <mybatis:scan base-package="org.mybatis.spring.mapper" process-property-placeholders="false" />
+  <bean id="myObject" class="org.mybatis.spring.config.MyFactoryBean" />
+  <bean id="myBean" class="org.mybatis.spring.config.MyBean">
+    <constructor-arg value="xml" />
+  </bean>
+  <bean id="propertyConfigurer" class="org.springframework.beans.factory.config.PropertyOverrideConfigurer">
+    <property name="location" value="classpath:/org/mybatis/spring/config/override.properties" />
+  </bean>
+</beans>
diff --git a/src/test/java/org/mybatis/spring/config/process-property-placeholders-true.xml b/src/test/java/org/mybatis/spring/config/process-property-placeholders-true.xml
new file mode 100644
index 0000000000..d10857c242
--- /dev/null
+++ b/src/test/java/org/mybatis/spring/config/process-property-placeholders-true.xml
@@ -0,0 +1,36 @@
+<?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.
+
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       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://mybatis.org/schema/mybatis-spring http://mybatis.org/schema/mybatis-spring.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
+
+  <context:property-placeholder location="classpath:/org/mybatis/spring/config/placeholders.properties"/>
+  <mybatis:scan base-package="${scan-package}" process-property-placeholders="true" />
+  <bean id="myObject" class="org.mybatis.spring.config.MyFactoryBean" />
+  <bean id="myBean" class="org.mybatis.spring.config.MyBean">
+    <constructor-arg value="xml" />
+  </bean>
+  <bean id="propertyConfigurer" class="org.springframework.beans.factory.config.PropertyOverrideConfigurer">
+    <property name="location" value="classpath:/org/mybatis/spring/config/override.properties" />
+    <property name="ignoreInvalidKeys" value="true" />
+  </bean>
+</beans>

From 696a3a46bbc4d0827fd65ff122b62b3ae99140fe Mon Sep 17 00:00:00 2001
From: Kazuki Shimizu <kazuki43zoo@gmail.com>
Date: Sat, 17 Jun 2023 22:52:32 +0900
Subject: [PATCH 2/2] Change `@since` 2.1.2

---
 src/main/java/org/mybatis/spring/annotation/MapperScan.java     | 2 +-
 src/main/resources/org/mybatis/spring/config/mybatis-spring.xsd | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/mybatis/spring/annotation/MapperScan.java b/src/main/java/org/mybatis/spring/annotation/MapperScan.java
index 9d51b7ce42..d9939fb15c 100644
--- a/src/main/java/org/mybatis/spring/annotation/MapperScan.java
+++ b/src/main/java/org/mybatis/spring/annotation/MapperScan.java
@@ -190,7 +190,7 @@
    * <p>
    * The default is {@literal true}. This means that a property placeholder processing execute.
    *
-   * @since 3.0.3
+   * @since 2.1.2
    *
    * @return a flag that whether execute a property placeholder processing or not
    */
diff --git a/src/main/resources/org/mybatis/spring/config/mybatis-spring.xsd b/src/main/resources/org/mybatis/spring/config/mybatis-spring.xsd
index 5366717e4d..64162fa10d 100644
--- a/src/main/resources/org/mybatis/spring/config/mybatis-spring.xsd
+++ b/src/main/resources/org/mybatis/spring/config/mybatis-spring.xsd
@@ -152,7 +152,7 @@
         <xsd:annotation>
           <xsd:documentation>
             <![CDATA[
-              Specifies a flag that whether execute a property placeholder processing or not. (Since 3.0.3)
+              Specifies a flag that whether execute a property placeholder processing or not. (Since 2.1.2)
               The default is true. This means that a property placeholder processing execute.
             ]]>
           </xsd:documentation>