diff --git a/examples/showcase/src/main/java/org/springside/examples/showcase/repository/AccountMybatisDaoImpl.java b/examples/showcase/src/main/java/org/springside/examples/showcase/repository/AccountMybatisDaoImpl.java deleted file mode 100644 index ab739c8d..00000000 --- a/examples/showcase/src/main/java/org/springside/examples/showcase/repository/AccountMybatisDaoImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package org.springside.examples.showcase.repository; - -import java.util.List; -import java.util.Map; - -import org.springframework.stereotype.Component; -import org.springside.examples.showcase.entity.Team; -import org.springside.examples.showcase.entity.User; - -@Component -public class AccountMybatisDaoImpl implements AccountMybatisDao { - - @Override - public Team getTeamDetail(Long id) { - // TODO Auto-generated method stub - return null; - } - - @Override - public List searchUser(Map parameters) { - // TODO Auto-generated method stub - return null; - } - - @Override - public Long saveUser(User user) { - // TODO Auto-generated method stub - return null; - } - - @Override - public void deleteUser(Long id) { - // TODO Auto-generated method stub - - } - -} diff --git a/examples/showcase/src/main/java/org/springside/examples/showcase/repository/UserDao.java b/examples/showcase/src/main/java/org/springside/examples/showcase/repository/jpa/UserDao.java similarity index 82% rename from examples/showcase/src/main/java/org/springside/examples/showcase/repository/UserDao.java rename to examples/showcase/src/main/java/org/springside/examples/showcase/repository/jpa/UserDao.java index e49915a9..840623dd 100644 --- a/examples/showcase/src/main/java/org/springside/examples/showcase/repository/UserDao.java +++ b/examples/showcase/src/main/java/org/springside/examples/showcase/repository/jpa/UserDao.java @@ -1,4 +1,4 @@ -package org.springside.examples.showcase.repository; +package org.springside.examples.showcase.repository.jpa; import org.springframework.data.repository.PagingAndSortingRepository; import org.springside.examples.showcase.entity.User; diff --git a/examples/showcase/src/main/java/org/springside/examples/showcase/repository/AccountMybatisDao.java b/examples/showcase/src/main/java/org/springside/examples/showcase/repository/mybatis/AccountDao.java similarity index 64% rename from examples/showcase/src/main/java/org/springside/examples/showcase/repository/AccountMybatisDao.java rename to examples/showcase/src/main/java/org/springside/examples/showcase/repository/mybatis/AccountDao.java index c570271a..a8b7fe4c 100644 --- a/examples/showcase/src/main/java/org/springside/examples/showcase/repository/AccountMybatisDao.java +++ b/examples/showcase/src/main/java/org/springside/examples/showcase/repository/mybatis/AccountDao.java @@ -1,4 +1,4 @@ -package org.springside.examples.showcase.repository; +package org.springside.examples.showcase.repository.mybatis; import java.util.List; import java.util.Map; @@ -6,9 +6,11 @@ import java.util.Map; import org.springside.examples.showcase.entity.Team; import org.springside.examples.showcase.entity.User; -public interface AccountMybatisDao { +public interface AccountDao { - public Team getTeamDetail(Long id); + public Team getTeamWithDetail(Long id); + + public User getUser(Long id); public List searchUser(Map parameters); diff --git a/examples/showcase/src/main/java/org/springside/examples/showcase/service/AccountService.java b/examples/showcase/src/main/java/org/springside/examples/showcase/service/AccountService.java index 8ab37535..d94b30c4 100644 --- a/examples/showcase/src/main/java/org/springside/examples/showcase/service/AccountService.java +++ b/examples/showcase/src/main/java/org/springside/examples/showcase/service/AccountService.java @@ -13,7 +13,7 @@ import org.springside.examples.showcase.entity.User; import org.springside.examples.showcase.modules.cache.memcached.MemcachedObjectType; import org.springside.examples.showcase.modules.jms.simple.NotifyMessageProducer; import org.springside.examples.showcase.modules.jmx.ApplicationStatistics; -import org.springside.examples.showcase.repository.UserDao; +import org.springside.examples.showcase.repository.jpa.UserDao; import org.springside.examples.showcase.service.ShiroDbRealm.HashPassword; import org.springside.modules.cache.memcached.SpyMemcachedClient; import org.springside.modules.mapper.JsonMapper; diff --git a/examples/showcase/src/main/java/org/springside/examples/showcase/webservice/soap/AccountWebServiceImpl.java b/examples/showcase/src/main/java/org/springside/examples/showcase/webservice/soap/AccountWebServiceImpl.java index ff735716..adaa4e6d 100644 --- a/examples/showcase/src/main/java/org/springside/examples/showcase/webservice/soap/AccountWebServiceImpl.java +++ b/examples/showcase/src/main/java/org/springside/examples/showcase/webservice/soap/AccountWebServiceImpl.java @@ -15,7 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.dao.DataIntegrityViolationException; import org.springside.examples.showcase.entity.Team; import org.springside.examples.showcase.entity.User; -import org.springside.examples.showcase.repository.AccountMybatisDao; +import org.springside.examples.showcase.repository.mybatis.AccountDao; import org.springside.examples.showcase.webservice.soap.response.GetTeamDetailResponse; import org.springside.examples.showcase.webservice.soap.response.SearchUserResponse; import org.springside.examples.showcase.webservice.soap.response.base.IdResponse; @@ -40,7 +40,7 @@ public class AccountWebServiceImpl implements AccountWebService { private static Logger logger = LoggerFactory.getLogger(AccountWebServiceImpl.class); @Autowired - private AccountMybatisDao accountDao; + private AccountDao accountDao; @Autowired private Validator validator; @@ -54,7 +54,7 @@ public class AccountWebServiceImpl implements AccountWebService { Validate.notNull(id, "id参数为空"); - Team team = accountDao.getTeamDetail(id); + Team team = accountDao.getTeamWithDetail(id); Validate.notNull(team, "项目不存在(id:" + id + ")"); diff --git a/examples/showcase/src/main/resources/applicationContext.xml b/examples/showcase/src/main/resources/applicationContext.xml index 83b68cf6..e13b5748 100644 --- a/examples/showcase/src/main/resources/applicationContext.xml +++ b/examples/showcase/src/main/resources/applicationContext.xml @@ -42,6 +42,19 @@ + + + + + + + + + + + + + diff --git a/examples/showcase/src/main/resources/mybatis/AccountMapper.xml b/examples/showcase/src/main/resources/mybatis/AccountMapper.xml new file mode 100644 index 00000000..2dd53779 --- /dev/null +++ b/examples/showcase/src/main/resources/mybatis/AccountMapper.xml @@ -0,0 +1,76 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + insert into ss_user ( + login_name, name, password, email, team_id) + values ( + #{loginName}, #{name}, #{password}, #{email}, + #{team.id}) + + + + + delete from ss_user where id=#{id} + + diff --git a/examples/showcase/src/main/resources/sql/h2/schema.sql b/examples/showcase/src/main/resources/sql/h2/schema.sql index c4682436..a43f8aca 100644 --- a/examples/showcase/src/main/resources/sql/h2/schema.sql +++ b/examples/showcase/src/main/resources/sql/h2/schema.sql @@ -3,6 +3,8 @@ drop table if exists ss_role; drop table if exists ss_user; + + drop table if exists ss_team; create table ss_role ( id varchar(16), @@ -18,6 +20,7 @@ salt varchar(64), email varchar(128), status varchar(32), + team_id varchar(16), primary key (id) ); @@ -27,13 +30,11 @@ primary key (user_id, role_id) ); + create table ss_team ( + id varchar(16), + name varchar(255) not null unique, + master varchar(16), + primary key (id) + ); - alter table ss_user_role - add constraint FK1306854BF125651E - foreign key (user_id) - references ss_user; - - alter table ss_user_role - add constraint FK1306854B4BFAA13E - foreign key (role_id) - references ss_role; + diff --git a/examples/showcase/src/test/java/org/springside/examples/showcase/repository/JpaMappingTest.java b/examples/showcase/src/test/java/org/springside/examples/showcase/repository/jpa/JpaMappingTest.java similarity index 95% rename from examples/showcase/src/test/java/org/springside/examples/showcase/repository/JpaMappingTest.java rename to examples/showcase/src/test/java/org/springside/examples/showcase/repository/jpa/JpaMappingTest.java index e0262108..14b0efbb 100644 --- a/examples/showcase/src/test/java/org/springside/examples/showcase/repository/JpaMappingTest.java +++ b/examples/showcase/src/test/java/org/springside/examples/showcase/repository/jpa/JpaMappingTest.java @@ -1,4 +1,4 @@ -package org.springside.examples.showcase.repository; +package org.springside.examples.showcase.repository.jpa; import javax.persistence.EntityManager; import javax.persistence.PersistenceContext; diff --git a/examples/showcase/src/test/java/org/springside/examples/showcase/repository/mybatis/MyBatisTest.java b/examples/showcase/src/test/java/org/springside/examples/showcase/repository/mybatis/MyBatisTest.java new file mode 100644 index 00000000..99feb990 --- /dev/null +++ b/examples/showcase/src/test/java/org/springside/examples/showcase/repository/mybatis/MyBatisTest.java @@ -0,0 +1,38 @@ +package org.springside.examples.showcase.repository.mybatis; + +import static org.junit.Assert.*; + +import java.util.List; +import java.util.Map; + +import org.junit.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.transaction.TransactionConfiguration; +import org.springside.examples.showcase.entity.User; +import org.springside.modules.test.spring.SpringTransactionalTestCase; + +import com.google.common.collect.Maps; + +@ContextConfiguration(locations = { "/applicationContext.xml" }) +@TransactionConfiguration(transactionManager = "defaultTransactionManager") +public class MyBatisTest extends SpringTransactionalTestCase { + + @Autowired + private AccountDao accountMapper; + + @Test + public void getUser() throws Exception { + User user = accountMapper.getUser(1L); + assertEquals("admin", user.getLoginName()); + } + + @Test + public void searchUser() throws Exception { + Map parameter = Maps.newHashMap(); + parameter.put("name", "Admin"); + List result = accountMapper.searchUser(parameter); + assertEquals(1, result.size()); + assertEquals("admin", result.get(0).getLoginName()); + } +} diff --git a/examples/showcase/src/test/java/org/springside/examples/showcase/service/AccountServiceTest.java b/examples/showcase/src/test/java/org/springside/examples/showcase/service/AccountServiceTest.java index 6283597c..fe9119ee 100644 --- a/examples/showcase/src/test/java/org/springside/examples/showcase/service/AccountServiceTest.java +++ b/examples/showcase/src/test/java/org/springside/examples/showcase/service/AccountServiceTest.java @@ -8,7 +8,7 @@ import org.junit.Test; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.springside.examples.showcase.entity.User; -import org.springside.examples.showcase.repository.UserDao; +import org.springside.examples.showcase.repository.jpa.UserDao; import org.springside.examples.showcase.service.AccountService; import org.springside.examples.showcase.service.ServiceException; import org.springside.modules.test.security.shiro.ShiroTestUtils; diff --git a/examples/showcase/src/test/resources/data/sample-data.xml b/examples/showcase/src/test/resources/data/sample-data.xml index d9d079d1..2f2c602f 100644 --- a/examples/showcase/src/test/resources/data/sample-data.xml +++ b/examples/showcase/src/test/resources/data/sample-data.xml @@ -1,11 +1,11 @@ - - - - - - + + + + + + @@ -15,4 +15,5 @@ +