fix for http://code.google.com/p/mybatis/issues/detail?id=559 : Overriding sqlSessionTemplate in MapperFactoryBean not working in certain circumstances

Author: emacarron

pom.xml

@@ -46,6 +46,11 @@
       <email>giovanni.cuccu@gmail.com</email>
     </contributor>
 
+    <contributor>
+      <name>Kay Huber</name>
+      <email>kay.huber@gmail.com</email>
+    </contributor>
+
     <contributor>
       <name>Raj Nagappan</name>
       <email>raj@velocitylabs.com</email>

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

@@ -398,18 +398,29 @@ protected Set<BeanDefinitionHolder> doScan(String... basePackages) {
 
           definition.getPropertyValues().add("addToConfig", MapperScannerConfigurer.this.addToConfig);
 
+          boolean explicitFactoryUsed = false;
           if (StringUtils.hasLength(MapperScannerConfigurer.this.sqlSessionFactoryBeanName)) {
-            definition.getPropertyValues().add("sqlSessionFactory",
-                new RuntimeBeanReference(MapperScannerConfigurer.this.sqlSessionFactoryBeanName));
+            definition.getPropertyValues().add("sqlSessionFactory", new RuntimeBeanReference(MapperScannerConfigurer.this.sqlSessionFactoryBeanName));
+            definition.getPropertyValues().add("sqlSessionTemplate", null);
+            explicitFactoryUsed = true;
           } else if (MapperScannerConfigurer.this.sqlSessionFactory != null) {
             definition.getPropertyValues().add("sqlSessionFactory", MapperScannerConfigurer.this.sqlSessionFactory);
+            definition.getPropertyValues().add("sqlSessionTemplate", null);
+            explicitFactoryUsed = true;
           }
 
           if (StringUtils.hasLength(MapperScannerConfigurer.this.sqlSessionTemplateBeanName)) {
-            definition.getPropertyValues().add("sqlSessionTemplate",
-                new RuntimeBeanReference(MapperScannerConfigurer.this.sqlSessionTemplateBeanName));
+            if (explicitFactoryUsed) {
+              logger.warn("Cannot use both: sqlSessionTemplate and sqlSessionFactory together. sqlSessionFactory is ignored.");
+            }
+            definition.getPropertyValues().add("sqlSessionTemplate", new RuntimeBeanReference(MapperScannerConfigurer.this.sqlSessionTemplateBeanName));
+            definition.getPropertyValues().add("sqlSessionFactory", null);
           } else if (MapperScannerConfigurer.this.sqlSessionTemplate != null) {
+            if (explicitFactoryUsed) {
+              logger.warn("Cannot use both: sqlSessionTemplate and sqlSessionFactory together. sqlSessionFactory is ignored.");
+            }
             definition.getPropertyValues().add("sqlSessionTemplate", MapperScannerConfigurer.this.sqlSessionTemplate);
+            definition.getPropertyValues().add("sqlSessionFactory", null);
           }
         }
       }

src/test/java/org/mybatis/spring/submitted/autowire/AutowireTest.java

@@ -0,0 +1,17 @@
+package org.mybatis.spring.submitted.autowire;
+
+import static org.junit.Assert.assertNotNull;
+
+import org.junit.Test;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+
+public class AutowireTest {
+	private ClassPathXmlApplicationContext context;
+	
+	@Test
+	public void shouldReturnMapper() {
+		context = new ClassPathXmlApplicationContext("classpath:org/mybatis/spring/submitted/autowire/spring.xml");
+		FooMapper bean = (FooMapper) context.getBean("fooMapper");
+		assertNotNull(bean);
+	}
+}

src/test/java/org/mybatis/spring/submitted/autowire/FooMapper.java

@@ -0,0 +1,5 @@
+package org.mybatis.spring.submitted.autowire;
+
+public interface FooMapper {
+	public void executeBar();
+}

src/test/java/org/mybatis/spring/submitted/autowire/FooMapper.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD MApper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.mybatis.spring.submitted.autowire.FooMapper">
+	<update id="executeBar">
+	</update>
+</mapper>

src/test/java/org/mybatis/spring/submitted/autowire/spring.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:context="http://www.springframework.org/schema/context"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans 
+						http://www.springframework.org/schema/beans/spring-beans.xsd
+    					http://www.springframework.org/schema/context
+       					http://www.springframework.org/schema/context/spring-context.xsd"
+	default-lazy-init="false">
+	
+	<bean id="dataSource" class="org.hsqldb.jdbc.JDBCDataSource">
+		<property name="url" value="jdbc:hsqldb:mem:autowire"/>
+	</bean>
+	
+	<bean id="sqlSessionFactoryA" class="org.mybatis.spring.SqlSessionFactoryBean">
+		<property name="dataSource" ref="dataSource" />
+	</bean>
+	
+	<bean id="sqlSessionFactoryB" class="org.mybatis.spring.SqlSessionFactoryBean">
+		<property name="dataSource" ref="dataSource" />
+	</bean>
+	
+	<bean id="sqlSessionTemplateA" class="org.mybatis.spring.SqlSessionTemplate">
+		<constructor-arg index="0" ref="sqlSessionFactoryA"/>
+		<constructor-arg index="1" value="SIMPLE"/>
+		<constructor-arg index="2"><null/></constructor-arg>
+	</bean>
+
+	<bean class="org.mybatis.spring.mapper.MapperScannerConfigurer">
+		<property name="basePackage" value="org.mybatis.spring.submitted.autowire" />
+		<property name="sqlSessionTemplate" ref="sqlSessionTemplateA" />
+	</bean>
+</beans>