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 0000000000000000000000000000000000000000..bd94468a391e6b4e24fb20c8592de1165cfc0ce3 --- /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 8381bb4600ee34c68683897f04019cfc43a7dd73..f3297c5bfbfa315cd121c4f8cd07705b9967315f 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 986189f93c13a6cfa5c1906cce675de280ade52a..21ae0b621a217e9d846533f4b5b4857f0a9c22ac 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 searchUser(Map parameters); + public List search(Map 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 37ccc8fcf2e6fb7816723a54f9f1446d7b05debb..24068e981542c957a53fa462a3851408eb748abb 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 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 5d5b55fdf8473ac7950e189d68f6acac46e4f5f7..378863e37ca348eb646e9032ada6fa95e82d173b 100644 --- a/examples/showcase/src/main/resources/applicationContext.xml +++ b/examples/showcase/src/main/resources/applicationContext.xml @@ -39,20 +39,21 @@ - + - + - + - + + diff --git a/examples/showcase/src/main/resources/mybatis/TeamMapper.xml b/examples/showcase/src/main/resources/mybatis/TeamMapper.xml index a12b7ba60d4047f274d05e9aee9f73b0cd60a8f6..07b37d007bfca3b175a4e1dbc270aee158e005a2 100644 --- a/examples/showcase/src/main/resources/mybatis/TeamMapper.xml +++ b/examples/showcase/src/main/resources/mybatis/TeamMapper.xml @@ -19,7 +19,7 @@ - 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 b264f17365b0cad856674f12bfff807df69265cf..9d1112e2ac4e4e3e19f6428fe4bb1022d339492b 100644 --- a/examples/showcase/src/main/resources/mybatis/UserMapper.xml +++ b/examples/showcase/src/main/resources/mybatis/UserMapper.xml @@ -6,7 +6,7 @@ - select id, name, email, login_name as loginName, team_id as "team.id" @@ -15,7 +15,7 @@ - select id, name, email, login_name as loginName, team_id as "team.id" @@ -31,7 +31,7 @@ - + insert into ss_user ( login_name, name, password, email, team_id) values ( @@ -40,7 +40,7 @@ - + delete from ss_user where id=#{id} 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 b3d0ea901ccedab337a71b12a2f9f7474444bdc5..a7f122fe2f4b102b01e4c6196053cf85d8236e14 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 c216df4c72d8e939641c7afbae2f8125e357ea96..86d94e6997d9f97ec0e6fd9c86e7b63202cbb3e4 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 parameter = Maps.newHashMap(); parameter.put("name", "Admin"); - List result = userDao.searchUser(parameter); + List 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)); } }