Samples refactor and new docs for samples

Author: emacarron

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

@@ -70,7 +70,7 @@ public class ClassPathMapperScanner extends ClassPathBeanDefinitionScanner {
 
   private Class<?> markerInterface;
 
-  private MapperFactoryBean mapperFactoryBean = new MapperFactoryBean();
+  private MapperFactoryBean<?> mapperFactoryBean = new MapperFactoryBean<Object>();
 
   public ClassPathMapperScanner(BeanDefinitionRegistry registry) {
     super(registry, false);
@@ -104,8 +104,8 @@ public void setSqlSessionFactoryBeanName(String sqlSessionFactoryBeanName) {
     this.sqlSessionFactoryBeanName = sqlSessionFactoryBeanName;
   }
 
-  public void setMapperFactoryBean(MapperFactoryBean mapperFactoryBean) {
-    this.mapperFactoryBean = mapperFactoryBean != null ? mapperFactoryBean : new MapperFactoryBean();
+  public void setMapperFactoryBean(MapperFactoryBean<?> mapperFactoryBean) {
+    this.mapperFactoryBean = mapperFactoryBean != null ? mapperFactoryBean : new MapperFactoryBean<Object>();
   }
 
 

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

@@ -59,7 +59,7 @@ public class MapperFactoryBean<T> extends SqlSessionDaoSupport implements Factor
   private boolean addToConfig = true;
 
   public MapperFactoryBean() {
-    //intentially empty 
+    //intentionally empty 
   }
 
   public MapperFactoryBean(Class<T> mapperInterface) {

src/site/xdoc/sample.xml

@@ -29,8 +29,8 @@
 import org.mybatis.spring.SqlSessionFactoryBean;
 import org.mybatis.spring.SqlSessionTemplate;
 import org.mybatis.spring.mapper.MapperFactoryBean;
-import org.mybatis.spring.sample.dao.UserDao;
 import org.mybatis.spring.sample.domain.User;
+import org.mybatis.spring.sample.mapper.UserMapper;
 import org.mybatis.spring.sample.service.FooService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
@@ -47,7 +47,7 @@
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(loader = AnnotationConfigContextLoader.class)
-public class ConfigurationSampleTest {
+public class SampleConfigurationTest {
 
   @Configuration
   static class ContextConfiguration {
@@ -70,21 +70,21 @@ public PlatformTransactionManager transactionalManagerOne() {
     public SqlSessionFactory sqlSessionFactory() throws Exception {
       SqlSessionFactoryBean ss = new SqlSessionFactoryBean();
       ss.setDataSource(dataSource());
-      ss.setMapperLocations(new Resource[] { new ClassPathResource("org/mybatis/spring/sample/dao/UserDao.xml") });
+      ss.setMapperLocations(new Resource[] { new ClassPathResource("org/mybatis/spring/sample/mapper/UserMapper.xml") });
       return (SqlSessionFactory) ss.getObject();
     }
 
     @Bean
-    public UserDao userDao() throws Exception {
+    public UserMapper userMapper() throws Exception {
       // when using javaconfig a template requires less lines than a MapperFactoryBean
       SqlSessionTemplate sessionTemplate = new SqlSessionTemplate(sqlSessionFactory());
-      return sessionTemplate.getMapper(UserDao.class);
+      return sessionTemplate.getMapper(UserMapper.class);
     }
 
     @Bean
-    public UserDao userDaoWithFactory() throws Exception {
-      MapperFactoryBean<UserDao> mapperFactoryBean = new MapperFactoryBean<UserDao>();
-      mapperFactoryBean.setMapperInterface(UserDao.class);
+    public UserMapper userMapperWithFactory() throws Exception {
+      MapperFactoryBean<UserMapper> mapperFactoryBean = new MapperFactoryBean<UserMapper>();
+      mapperFactoryBean.setMapperInterface(UserMapper.class);
       mapperFactoryBean.setSqlSessionFactory(sqlSessionFactory());
       mapperFactoryBean.afterPropertiesSet();
       return mapperFactoryBean.getObject();
@@ -93,7 +93,7 @@ public UserDao userDaoWithFactory() throws Exception {
     @Bean
     public FooService fooService() throws Exception {
       FooService fooService = new FooService();
-      fooService.setUserDao(userDao());
+      fooService.setUserMapper(userMapper());
       return fooService;
     }
   }

src/test/java/org/mybatis/spring/sample/ConfigurationSampleTest.java renamed to src/test/java/org/mybatis/spring/sample/SampleConfigurationTest.java

@@ -32,7 +32,7 @@ public class SampleEnableTest extends AbstractSampleTest {
 
 	@Configuration
 	@ImportResource("classpath:org/mybatis/spring/sample/config/applicationContext-infrastructure.xml")
-	@MapperScan("org.mybatis.spring.sample.dao")
+	@MapperScan("org.mybatis.spring.sample.mapper")
 	static class AppConfig {
 	}
 }

src/test/java/org/mybatis/spring/sample/SampleEnableTest.java

@@ -29,8 +29,8 @@
 	<import resource="classpath:org/mybatis/spring/sample/config/applicationContext-infrastructure.xml"/>
 
     <!-- To change the default ExecutorType, a custom SqlSessionTemplate is all that is needed. -->
-    <bean id="userDao" class="org.mybatis.spring.mapper.MapperFactoryBean">
-        <property name="mapperInterface" value="org.mybatis.spring.sample.dao.UserDao" />
+    <bean id="userMapper" class="org.mybatis.spring.mapper.MapperFactoryBean">
+        <property name="mapperInterface" value="org.mybatis.spring.sample.mapper.UserMapper" />
         <property name="sqlSessionTemplate">
           <bean class="org.mybatis.spring.SqlSessionTemplate">
             <constructor-arg index="0" ref="sqlSessionFactory" />

src/test/java/org/mybatis/spring/sample/config/applicationContext-batch.xml

@@ -56,11 +56,11 @@
              file. This config file could, in turn, contain &ltmapper&gt
              elements that point to the correct mapper xml files.
          -->
-        <property name="mapperLocations" value="classpath:org/mybatis/spring/sample/dao/*.xml" />
+        <property name="mapperLocations" value="classpath:org/mybatis/spring/sample/mapper/*.xml" />
     </bean>
 
-    <!-- simple transactional service layer bean; the userDao can be implemented in various ways with MyBatis-Spring  -->
+    <!-- simple transactional service layer bean; MyBatis-Spring will create a proxy for the userMapper bean -->
     <bean id="fooService" class="org.mybatis.spring.sample.service.FooService">
-        <property name="userDao" ref="userDao" />
+        <property name="userMapper" ref="userMapper" />
     </bean>
 </beans>

src/test/java/org/mybatis/spring/sample/config/applicationContext-infrastructure.xml

@@ -17,7 +17,7 @@
 
 <!--
     A sample context that shows how to integrate MyBatis with Spring using a
-    MapperFactoryBean. With this configuration, DAOs are created
+    MapperFactoryBean. With this configuration, mappers are created
     automatically but each one much be defined in the context using an
     implementation (mapper) interface.
 
@@ -31,10 +31,8 @@
 	<!-- import datasource and transaction manager -->
 	<import	resource="classpath:org/mybatis/spring/sample/config/applicationContext-infrastructure.xml" />
 
-	<!-- Directly injecting mappers; notice there is no UserDaoImplementation 
-		needed, but the DAO interface is required. The required SqlSessionFactory 
-		will be autowired. -->
-	<bean id="userDao" class="org.mybatis.spring.mapper.MapperFactoryBean" autowire="byType">
-		<property name="mapperInterface" value="org.mybatis.spring.sample.dao.UserDao" />
+	<!-- Directly injecting mappers. The required SqlSessionFactory will be autowired. -->
+	<bean id="userMapper" class="org.mybatis.spring.mapper.MapperFactoryBean" autowire="byType">
+		<property name="mapperInterface" value="org.mybatis.spring.sample.mapper.UserMapper" />
 	</bean>
 </beans>

src/test/java/org/mybatis/spring/sample/config/applicationContext-mapper.xml

@@ -35,5 +35,5 @@
     <!-- Scan for mappers and let them be autowired; notice there is no
          UserDaoImplementation needed. The required SqlSessionFactory will be
          autowired. -->
-    <mybatis:scan base-package="org.mybatis.spring.sample.dao" />
+    <mybatis:scan base-package="org.mybatis.spring.sample.mapper" />
 </beans>

src/test/java/org/mybatis/spring/sample/config/applicationContext-namespace.xml

@@ -34,6 +34,6 @@
          UserDaoImplementation needed. The required SqlSessionFactory will be
          autowired. -->
     <bean class="org.mybatis.spring.mapper.MapperScannerConfigurer">
-        <property name="basePackage" value="org.mybatis.spring.sample.dao" />
+        <property name="basePackage" value="org.mybatis.spring.sample.mapper" />
     </bean>
 </beans>