From 3527232468f67f3ead62f4eff4099641da8fbf7a Mon Sep 17 00:00:00 2001
From: Calvin <calvinxiu@gmail.com>
Date: Tue, 7 Aug 2012 14:32:59 +0800
Subject: [PATCH] =?UTF-8?q?#57=20=E5=9C=A8=E6=89=AB=E6=8F=8FMyBatis?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=97=B6=EF=BC=8C=E5=8A=A0=E5=85=A5annotatio?=
 =?UTF-8?q?n=20class=E7=9A=84=E9=99=90=E5=AE=9A=EF=BC=8C=E9=80=82=E5=90=88?=
 =?UTF-8?q?dao=E6=94=BE=E5=9C=A8=E4=B8=8D=E5=90=8C=E7=9A=84=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E7=9B=AE=E5=BD=95=E7=9A=84=E6=83=85=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../repository/mybatis/MyBatisRepository.java   | 17 +++++++++++++++++
 .../repository/mybatis/TeamMybatisDao.java      |  3 ++-
 .../repository/mybatis/UserMybatisDao.java      |  9 +++++----
 .../service/AccountEffectiveService.java        | 10 +++++-----
 .../src/main/resources/applicationContext.xml   |  9 +++++----
 .../src/main/resources/mybatis/TeamMapper.xml   |  2 +-
 .../src/main/resources/mybatis/UserMapper.xml   |  8 ++++----
 .../repository/mybatis/TeamMybatisDaoTest.java  |  2 +-
 .../repository/mybatis/UserMybatisDaoTest.java  | 12 ++++++------
 9 files changed, 46 insertions(+), 26 deletions(-)
 create mode 100644 examples/showcase/src/main/java/org/springside/examples/showcase/repository/mybatis/MyBatisRepository.java

diff --git a/examples/showcase/src/main/java/org/springside/examples/showcase/repository/mybatis/MyBatisRepository.java b/examples/showcase/src/main/java/org/springside/examples/showcase/repository/mybatis/MyBatisRepository.java
new file mode 100644
index 00000000..bd94468a
--- /dev/null
+++ b/examples/showcase/src/main/java/org/springside/examples/showcase/repository/mybatis/MyBatisRepository.java
@@ -0,0 +1,17 @@
+package org.springside.examples.showcase.repository.mybatis;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * 标识MyBatis的DAO,方便{@link org.mybatis.spring.mapper.MapperScannerConfigurer}的扫描。
+ * 
+ * @author calvin
+ *
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.TYPE)
+public @interface MyBatisRepository {
+}
diff --git a/examples/showcase/src/main/java/org/springside/examples/showcase/repository/mybatis/TeamMybatisDao.java b/examples/showcase/src/main/java/org/springside/examples/showcase/repository/mybatis/TeamMybatisDao.java
index 8381bb46..f3297c5b 100644
--- a/examples/showcase/src/main/java/org/springside/examples/showcase/repository/mybatis/TeamMybatisDao.java
+++ b/examples/showcase/src/main/java/org/springside/examples/showcase/repository/mybatis/TeamMybatisDao.java
@@ -8,7 +8,8 @@ import org.springside.examples.showcase.entity.Team;
  * 
  * @author calvin
  */
+@MyBatisRepository
 public interface TeamMybatisDao {
 
-	public Team getTeamWithDetail(Long id);
+	public Team getWithDetail(Long id);
 }
diff --git a/examples/showcase/src/main/java/org/springside/examples/showcase/repository/mybatis/UserMybatisDao.java b/examples/showcase/src/main/java/org/springside/examples/showcase/repository/mybatis/UserMybatisDao.java
index 986189f9..21ae0b62 100644
--- a/examples/showcase/src/main/java/org/springside/examples/showcase/repository/mybatis/UserMybatisDao.java
+++ b/examples/showcase/src/main/java/org/springside/examples/showcase/repository/mybatis/UserMybatisDao.java
@@ -11,14 +11,15 @@ import org.springside.examples.showcase.entity.User;
  * 
  * @author calvin
  */
+@MyBatisRepository
 public interface UserMybatisDao {
 
-	public User getUser(Long id);
+	public User get(Long id);
 
-	public List<User> searchUser(Map<String, Object> parameters);
+	public List<User> search(Map<String, Object> parameters);
 
-	public void saveUser(User user);
+	public void save(User user);
 
-	public void deleteUser(Long id);
+	public void delete(Long id);
 
 }
diff --git a/examples/showcase/src/main/java/org/springside/examples/showcase/service/AccountEffectiveService.java b/examples/showcase/src/main/java/org/springside/examples/showcase/service/AccountEffectiveService.java
index 37ccc8fc..24068e98 100644
--- a/examples/showcase/src/main/java/org/springside/examples/showcase/service/AccountEffectiveService.java
+++ b/examples/showcase/src/main/java/org/springside/examples/showcase/service/AccountEffectiveService.java
@@ -36,7 +36,7 @@ public class AccountEffectiveService {
 	private final JsonMapper jsonMapper = JsonMapper.nonDefaultMapper();
 
 	public Team getTeamWithDetail(Long id) {
-		return teamDao.getTeamWithDetail(id);
+		return teamDao.getWithDetail(id);
 	}
 
 	/**
@@ -49,7 +49,7 @@ public class AccountEffectiveService {
 		String jsonString = memcachedClient.get(key);
 
 		if (jsonString == null) {
-			user = userDao.getUser(id);
+			user = userDao.get(id);
 			if (user != null) {
 				jsonString = jsonMapper.toJson(user);
 				memcachedClient.set(key, MemcachedObjectType.USER.getExpiredTime(), jsonString);
@@ -64,16 +64,16 @@ public class AccountEffectiveService {
 		Map<String, Object> parameters = Maps.newHashMap();
 		parameters.put("loginName", loginName);
 		parameters.put("name", name);
-		return userDao.searchUser(parameters);
+		return userDao.search(parameters);
 	}
 
 	@Transactional
 	public void saveUser(User user) {
-		userDao.saveUser(user);
+		userDao.save(user);
 	}
 
 	@Transactional
 	public void deleteUser(Long id) {
-		userDao.deleteUser(id);
+		userDao.delete(id);
 	}
 }
diff --git a/examples/showcase/src/main/resources/applicationContext.xml b/examples/showcase/src/main/resources/applicationContext.xml
index 5d5b55fd..378863e3 100644
--- a/examples/showcase/src/main/resources/applicationContext.xml
+++ b/examples/showcase/src/main/resources/applicationContext.xml
@@ -39,20 +39,21 @@
 		</property>
 	</bean>
 
-	<!-- Spring Data Jpa配置 -->
+	<!-- Spring Data Jpa配置, 扫描base-package下所有继承于Repository<T,ID>的接口, 动态生成实现类 -->
  	<jpa:repositories base-package="org.springside.examples.showcase" transaction-manager-ref="defaultTransactionManager" entity-manager-factory-ref="entityManagerFactory"/>
 	
 	<!-- MyBatis配置 -->
 	<bean id="sqlSessionFactory" class="org.mybatis.spring.SqlSessionFactoryBean">
 		<property name="dataSource" ref="dataSource" />
-		<!-- 自动扫描目录,省掉Configuration.xml里的手工配置Class名与缩写 -->
+		<!-- 自动扫描目录, 省掉Configuration.xml里的手工配置Class名及其缩写 -->
 		<property name="typeAliasesPackage" value="org.springside.examples.showcase.entity" />
 		<!-- 没有把mapper文件放到与dao相同的深层目录，显式指定Mapper文件位置 -->
 		<property name="mapperLocations" value="classpath:/mybatis/*Mapper.xml" />
 	</bean>
-	<!-- 在指定扫描所有接口, 动态生成MyBatis Dao接口实现-->
+	<!-- 扫描basePackage下所有接口, 动态生成MyBatis Dao接口实现 -->
 	<bean class="org.mybatis.spring.mapper.MapperScannerConfigurer">
-		<property name="basePackage" value="org.springside.examples.showcase.repository.mybatis" />
+		<property name="basePackage" value="org.springside.examples.showcase" />
+		<property name="annotationClass" value="org.springside.examples.showcase.repository.mybatis.MyBatisRepository"/>
 	</bean>
 	
 	<!-- 事务管理器配置, Jpa单数据源事务 -->
diff --git a/examples/showcase/src/main/resources/mybatis/TeamMapper.xml b/examples/showcase/src/main/resources/mybatis/TeamMapper.xml
index a12b7ba6..07b37d00 100644
--- a/examples/showcase/src/main/resources/mybatis/TeamMapper.xml
+++ b/examples/showcase/src/main/resources/mybatis/TeamMapper.xml
@@ -19,7 +19,7 @@
 	</resultMap>
 
 	<!-- 获取部门详细信息, 输出用resultMap关联嵌套对象 -->
-	<select id="getTeamWithDetail" parameterType="int" resultMap="teamDetailMap">
+	<select id="getWithDetail" parameterType="int" resultMap="teamDetailMap">
 		select t.id as team_id,
 		t.name as team_name,
 		m.id as master_id,
diff --git a/examples/showcase/src/main/resources/mybatis/UserMapper.xml b/examples/showcase/src/main/resources/mybatis/UserMapper.xml
index b264f173..9d1112e2 100644
--- a/examples/showcase/src/main/resources/mybatis/UserMapper.xml
+++ b/examples/showcase/src/main/resources/mybatis/UserMapper.xml
@@ -6,7 +6,7 @@
 	<!--
 		获取用户: 输出直接映射到对象, login_name列要"as loginName"以方便映射 ,team_id as "team.id"创建team对象并赋值
 	-->
-	<select id="getUser" parameterType="int" resultType="User">
+	<select id="get" parameterType="int" resultType="User">
 		select id, name, email,
 		login_name as loginName,
 		team_id as "team.id"
@@ -15,7 +15,7 @@
 	</select>
 
 	<!-- 查询用户,演示: 1.输入用map传入多个参数 2.<where>语句, 智能添加where和and关键字 3.输出直接映射对象 -->
-	<select id="searchUser" parameterType="map" resultType="User">
+	<select id="search" parameterType="map" resultType="User">
 		select id, name, email,
 		login_name as loginName,
 		team_id as "team.id"
@@ -31,7 +31,7 @@
 	</select>
 
 	<!-- 插入用户： 1.由数据库生成id并赋值到user对象 2.输入用对象, 嵌套属性表达式#{team.id} -->
-	<insert id="saveUser" parameterType="User" useGeneratedKeys="true" keyProperty="id">
+	<insert id="save" parameterType="User" useGeneratedKeys="true" keyProperty="id">
 		insert into ss_user (
 		login_name, name, password, email, team_id)
 		values (
@@ -40,7 +40,7 @@
 	</insert>
 	
 	<!-- 删除用户 -->
-	<delete id="deleteUser" parameterType="int">
+	<delete id="delete" parameterType="int">
 	     delete from ss_user where id=#{id}
 	</delete>
 </mapper> 
diff --git a/examples/showcase/src/test/java/org/springside/examples/showcase/repository/mybatis/TeamMybatisDaoTest.java b/examples/showcase/src/test/java/org/springside/examples/showcase/repository/mybatis/TeamMybatisDaoTest.java
index b3d0ea90..a7f122fe 100644
--- a/examples/showcase/src/test/java/org/springside/examples/showcase/repository/mybatis/TeamMybatisDaoTest.java
+++ b/examples/showcase/src/test/java/org/springside/examples/showcase/repository/mybatis/TeamMybatisDaoTest.java
@@ -20,7 +20,7 @@ public class TeamMybatisDaoTest extends SpringTransactionalTestCase {
 
 	@Test
 	public void getTeamWithDetail() throws Exception {
-		Team team = teamDao.getTeamWithDetail(1L);
+		Team team = teamDao.getWithDetail(1L);
 		assertEquals("Dolphin", team.getName());
 		assertEquals("Admin", team.getMaster().getName());
 	}
diff --git a/examples/showcase/src/test/java/org/springside/examples/showcase/repository/mybatis/UserMybatisDaoTest.java b/examples/showcase/src/test/java/org/springside/examples/showcase/repository/mybatis/UserMybatisDaoTest.java
index c216df4c..86d94e69 100644
--- a/examples/showcase/src/test/java/org/springside/examples/showcase/repository/mybatis/UserMybatisDaoTest.java
+++ b/examples/showcase/src/test/java/org/springside/examples/showcase/repository/mybatis/UserMybatisDaoTest.java
@@ -26,7 +26,7 @@ public class UserMybatisDaoTest extends SpringTransactionalTestCase {
 
 	@Test
 	public void getUser() throws Exception {
-		User user = userDao.getUser(1L);
+		User user = userDao.get(1L);
 		assertEquals("admin", user.getLoginName());
 	}
 
@@ -34,7 +34,7 @@ public class UserMybatisDaoTest extends SpringTransactionalTestCase {
 	public void searchUser() throws Exception {
 		Map<String, Object> parameter = Maps.newHashMap();
 		parameter.put("name", "Admin");
-		List<User> result = userDao.searchUser(parameter);
+		List<User> result = userDao.search(parameter);
 		assertEquals(1, result.size());
 		assertEquals("admin", result.get(0).getLoginName());
 	}
@@ -44,17 +44,17 @@ public class UserMybatisDaoTest extends SpringTransactionalTestCase {
 		//create
 		int count = countRowsInTable("ss_user");
 		User user = UserData.randomUser();
-		userDao.saveUser(user);
+		userDao.save(user);
 		Long id = user.getId();
 
 		assertEquals(count + 1, countRowsInTable("ss_user"));
-		User result = userDao.getUser(id);
+		User result = userDao.get(id);
 		assertEquals(user.getLoginName(), result.getLoginName());
 
 		//delete
-		userDao.deleteUser(id);
+		userDao.delete(id);
 		assertEquals(count, countRowsInTable("ss_user"));
-		assertNull(userDao.getUser(id));
+		assertNull(userDao.get(id));
 	}
 
 }
-- 
GitLab