From 310c3bcff03ae734412b8a13602d5352ff6ed7e3 Mon Sep 17 00:00:00 2001 From: Calvin Date: Wed, 29 Feb 2012 21:08:28 +0800 Subject: [PATCH] =?UTF-8?q?Showcase=E4=B9=9F=E8=BD=AC=E4=B8=BASpring=20Dat?= =?UTF-8?q?a=20Jpa?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- TODO.txt | 17 ++--- .../src/main/resources/applicationContext.xml | 11 ++-- examples/mini-web/pom.xml | 2 +- .../miniweb/dao/account/GroupDao.java | 2 +- .../miniweb/dao/account/GroupDaoCustom.java | 6 +- .../miniweb/dao/account/GroupDaoImpl.java | 4 +- .../examples/miniweb/dao/account/UserDao.java | 2 +- .../src/main/resources/applicationContext.xml | 31 +++++---- .../src/main/webapp/WEB-INF/spring-mvc.xml | 1 + examples/showcase/pom.xml | 20 ++++-- .../showcase/common/dao/RoleHibernateDao.java | 14 ---- .../showcase/common/dao/UserHibernateDao.java | 65 ------------------- .../showcase/common/dao/UserJpaDao.java | 11 ++++ .../common/service/AccountManager.java | 42 ++++++------ .../showcase/common/web/UserController.java | 2 +- .../rs/server/UserResourceService.java | 6 +- .../src/main/resources/META-INF/orm.xml | 4 ++ .../main/resources/META-INF/persistence.xml | 8 +++ .../src/main/resources/applicationContext.xml | 42 +++++++----- .../security/applicationContext-shiro.xml | 2 +- .../src/main/webapp/WEB-INF/spring-mvc.xml | 1 + .../showcase/src/main/webapp/WEB-INF/web.xml | 8 +-- .../showcase/common/AccountManagerTest.java | 6 +- .../showcase/common/HibernateMappingTest.java | 49 -------------- .../showcase/common/JpaMappingTest.java | 35 ++++++++++ .../showcase/common/UserHibernateDaoTest.java | 61 ----------------- .../springside/modules/orm/jpa/JpaUtils.java | 10 +++ 27 files changed, 182 insertions(+), 280 deletions(-) delete mode 100644 examples/showcase/src/main/java/org/springside/examples/showcase/common/dao/RoleHibernateDao.java delete mode 100644 examples/showcase/src/main/java/org/springside/examples/showcase/common/dao/UserHibernateDao.java create mode 100644 examples/showcase/src/main/java/org/springside/examples/showcase/common/dao/UserJpaDao.java create mode 100644 examples/showcase/src/main/resources/META-INF/orm.xml create mode 100644 examples/showcase/src/main/resources/META-INF/persistence.xml delete mode 100644 examples/showcase/src/test/java/org/springside/examples/showcase/common/HibernateMappingTest.java create mode 100644 examples/showcase/src/test/java/org/springside/examples/showcase/common/JpaMappingTest.java delete mode 100644 examples/showcase/src/test/java/org/springside/examples/showcase/common/UserHibernateDaoTest.java create mode 100644 modules/core/src/main/java/org/springside/modules/orm/jpa/JpaUtils.java diff --git a/TODO.txt b/TODO.txt index 2824eeb8..1f4a090e 100644 --- a/TODO.txt +++ b/TODO.txt @@ -5,9 +5,7 @@ TODO部分: 1.主要改动 - * 引入Profile管理環境 * 用Spring Data JPA代替BaseDao基类 - --Showcase --清理相关类 2.次要改动 @@ -19,14 +17,15 @@ TODO部分: * MVC框架从Struts2转为Spring MVC3. * DAO框架增加MyBatis的使用,与Hibernate在不同的场景各展所长 * 安全框架从SpringSecurity转为Apache Shiro. - * SpringSide Modules的重构 * 使用SiteMesh3实现Layout Decoration * CSS框架从YUI转为Blueprint + * Spring引入Profile概念统一测试、生产環境的配置 * 演示Hibernate Validator * 升級Jackson1.9 演示,包括可擴展的對象, 對象循環引用,局部更新,自定义类型的持久化,自定义Naming策略,已存在對象等新特性. * 添加各种常用Utility的Demo, 升级Guava和Commons-Lang3.0. * 升级Selenium2.0演示,融合Selenium 1.0与2.0的API * Mock框架从EasyMock+JMock换成Mockito + PowerMock + * SpringSide Modules的重构 * 依赖包重要版本升级如:Maven 3.0, Hibernate 3.6.9, Jetty 7.6.3 2. 次要改动 @@ -55,7 +54,8 @@ TODO部分: 1.主要改动 * 升级Hibernate 4.0 - * 升级Quartz2.x, Spring Schedule Executor配置升级 + * Schedule演示升级,升级Quartz2.x,Spring Schedule Executor配置升级 + * Search Form与分页 2.次要改动 * 包括Guava的Cache Builder做的简单缓存 @@ -64,16 +64,17 @@ TODO部分: * Jersey的Jackson JSON绑定看有没有简化,并升级其他用法。 * 升级Jquery-validation用法?? * JPA2.0特征 + * Shiro的方法级权限控制, Test Helper, enable/diable用户抛出用户已锁定的异常. * Hash与加密要加入salt * UT只初始化一次數據 * 用JUnit自带的Catetory的演示,Harmset演示 * Selenium使用自带的Wait类, 检查新版API变化 * 更深入演示PowerMock - * Shiro的方法级权限控制, Test Helper, enable/diable用户抛出用户已锁定的异常. - * 取消GBK编码的bat - * 第三方repository也移到github,依赖包次要版本升级:JSW 3.5.7, Log4jdbc,Spymemcached(需自行打包) - * 在Jenkins上运行覆盖率,Checkstyle,PMD,Findbugs检查 * 参考springfuse改进404.jsp,500.jsp + * 取消GBK编码的bat + * 第三方repository也移到github,依赖包次要版本升级:JSW 3.5.7, Log4jdbc,Spymemcached(需自行打包),在pom.xml中标注自己提供的包 + * 在Jenkins上运行覆盖率,Checkstyle,PMD,Findbugs检查 + 3.其他非代码改动 diff --git a/examples/mini-service/src/main/resources/applicationContext.xml b/examples/mini-service/src/main/resources/applicationContext.xml index 9e29e2c4..15af9f18 100644 --- a/examples/mini-service/src/main/resources/applicationContext.xml +++ b/examples/mini-service/src/main/resources/applicationContext.xml @@ -2,10 +2,11 @@ Spring公共配置文件 @@ -68,8 +69,6 @@ - - diff --git a/examples/mini-web/pom.xml b/examples/mini-web/pom.xml index 7bc50241..c769c40a 100644 --- a/examples/mini-web/pom.xml +++ b/examples/mini-web/pom.xml @@ -77,7 +77,7 @@ org.springframework.data spring-data-jpa - + org.springframework spring-orm diff --git a/examples/mini-web/src/main/java/org/springside/examples/miniweb/dao/account/GroupDao.java b/examples/mini-web/src/main/java/org/springside/examples/miniweb/dao/account/GroupDao.java index d27d7da6..ad1764b3 100644 --- a/examples/mini-web/src/main/java/org/springside/examples/miniweb/dao/account/GroupDao.java +++ b/examples/mini-web/src/main/java/org/springside/examples/miniweb/dao/account/GroupDao.java @@ -4,7 +4,7 @@ import org.springframework.data.repository.PagingAndSortingRepository; import org.springside.examples.miniweb.entity.account.Group; /** - * 权限组对象的泛型DAO. + * 权限组对象的Dao interface. * * @author calvin */ diff --git a/examples/mini-web/src/main/java/org/springside/examples/miniweb/dao/account/GroupDaoCustom.java b/examples/mini-web/src/main/java/org/springside/examples/miniweb/dao/account/GroupDaoCustom.java index 40aa6f86..4b71f0e1 100644 --- a/examples/mini-web/src/main/java/org/springside/examples/miniweb/dao/account/GroupDaoCustom.java +++ b/examples/mini-web/src/main/java/org/springside/examples/miniweb/dao/account/GroupDaoCustom.java @@ -1,8 +1,8 @@ package org.springside.examples.miniweb.dao.account; -import org.springframework.data.repository.NoRepositoryBean; - -@NoRepositoryBean +/** + * GroupDao的扩展行为interface. + */ public interface GroupDaoCustom { /** diff --git a/examples/mini-web/src/main/java/org/springside/examples/miniweb/dao/account/GroupDaoImpl.java b/examples/mini-web/src/main/java/org/springside/examples/miniweb/dao/account/GroupDaoImpl.java index b5a60e86..9d323f45 100644 --- a/examples/mini-web/src/main/java/org/springside/examples/miniweb/dao/account/GroupDaoImpl.java +++ b/examples/mini-web/src/main/java/org/springside/examples/miniweb/dao/account/GroupDaoImpl.java @@ -9,6 +9,9 @@ import org.springframework.stereotype.Component; import org.springside.examples.miniweb.entity.account.Group; import org.springside.examples.miniweb.entity.account.User; +/** + * GroupDao的扩展行为实现类. + */ @Component public class GroupDaoImpl implements GroupDaoCustom { @@ -24,7 +27,6 @@ public class GroupDaoImpl implements GroupDaoCustom { List users = (List) em.createQuery(QUERY_USER_BY_GROUPID).setParameter(1, id).getResultList(); for (User u : users) { u.getGroupList().remove(group); - em.persist(u); } em.remove(group); } diff --git a/examples/mini-web/src/main/java/org/springside/examples/miniweb/dao/account/UserDao.java b/examples/mini-web/src/main/java/org/springside/examples/miniweb/dao/account/UserDao.java index 39e09ebc..d4c8abbc 100644 --- a/examples/mini-web/src/main/java/org/springside/examples/miniweb/dao/account/UserDao.java +++ b/examples/mini-web/src/main/java/org/springside/examples/miniweb/dao/account/UserDao.java @@ -4,7 +4,7 @@ import org.springframework.data.repository.PagingAndSortingRepository; import org.springside.examples.miniweb.entity.account.User; /** - * 用户对象的Interface类. + * 用户对象的Dao interface. * * @author calvin */ diff --git a/examples/mini-web/src/main/resources/applicationContext.xml b/examples/mini-web/src/main/resources/applicationContext.xml index 50ce910e..0df5deca 100644 --- a/examples/mini-web/src/main/resources/applicationContext.xml +++ b/examples/mini-web/src/main/resources/applicationContext.xml @@ -3,15 +3,14 @@ xmlns:jee="http://www.springframework.org/schema/jee" xmlns:tx="http://www.springframework.org/schema/tx" xmlns:context="http://www.springframework.org/schema/context" xmlns:jpa="http://www.springframework.org/schema/data/jpa" xmlns:jdbc="http://www.springframework.org/schema/jdbc" xmlns:util="http://www.springframework.org/schema/util" - xmlns:p="http://www.springframework.org/schema/p" xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd - http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.1.xsd - http://www.springframework.org/schema/jee http://www.springframework.org/schema/jee/spring-jee-3.1.xsd - http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd - http://www.springframework.org/schema/data/jpa http://www.springframework.org/schema/data/jpa/spring-jpa.xsd - http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc-3.1.xsd - http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.1.xsd" + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd + http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.1.xsd + http://www.springframework.org/schema/jee http://www.springframework.org/schema/jee/spring-jee-3.1.xsd + http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd + http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc-3.1.xsd + http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.1.xsd + http://www.springframework.org/schema/data/jpa http://www.springframework.org/schema/data/jpa/spring-jpa.xsd" default-lazy-init="true"> Spring公共配置 @@ -21,10 +20,11 @@ - + + + + + ${hibernate.dialect} @@ -37,10 +37,13 @@ + - + + + + diff --git a/examples/mini-web/src/main/webapp/WEB-INF/spring-mvc.xml b/examples/mini-web/src/main/webapp/WEB-INF/spring-mvc.xml index b4918079..02d0d345 100644 --- a/examples/mini-web/src/main/webapp/WEB-INF/spring-mvc.xml +++ b/examples/mini-web/src/main/webapp/WEB-INF/spring-mvc.xml @@ -7,6 +7,7 @@ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd"> + diff --git a/examples/showcase/pom.xml b/examples/showcase/pom.xml index 4920583f..7661aa96 100644 --- a/examples/showcase/pom.xml +++ b/examples/showcase/pom.xml @@ -63,10 +63,18 @@ hibernate-core - javassist - javassist - 3.12.1.GA - + org.hibernate + hibernate-entitymanager + + + org.hibernate + hibernate-ehcache + + + org.hibernate.javax.persistence + hibernate-jpa-2.0-api + + org.mybatis @@ -78,6 +86,10 @@ + + org.springframework.data + spring-data-jpa + org.springframework spring-orm diff --git a/examples/showcase/src/main/java/org/springside/examples/showcase/common/dao/RoleHibernateDao.java b/examples/showcase/src/main/java/org/springside/examples/showcase/common/dao/RoleHibernateDao.java deleted file mode 100644 index a3a9fbd6..00000000 --- a/examples/showcase/src/main/java/org/springside/examples/showcase/common/dao/RoleHibernateDao.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.springside.examples.showcase.common.dao; - -import org.springframework.stereotype.Component; -import org.springside.examples.showcase.common.entity.Role; -import org.springside.modules.orm.hibernate.HibernateDao; - -/** - * 角色对象的泛型Hibernate Dao. - * - * @author calvin - */ -@Component -public class RoleHibernateDao extends HibernateDao { -} diff --git a/examples/showcase/src/main/java/org/springside/examples/showcase/common/dao/UserHibernateDao.java b/examples/showcase/src/main/java/org/springside/examples/showcase/common/dao/UserHibernateDao.java deleted file mode 100644 index aec5d192..00000000 --- a/examples/showcase/src/main/java/org/springside/examples/showcase/common/dao/UserHibernateDao.java +++ /dev/null @@ -1,65 +0,0 @@ -package org.springside.examples.showcase.common.dao; - -import java.util.Collections; -import java.util.List; -import java.util.Map; - -import org.hibernate.Criteria; -import org.hibernate.FetchMode; -import org.hibernate.Query; -import org.springframework.stereotype.Component; -import org.springside.examples.showcase.common.entity.User; -import org.springside.modules.orm.hibernate.HibernateDao; - -/** - * 用户对象的泛型Hibernate Dao. - * - * @author calvin - */ -@Component -public class UserHibernateDao extends HibernateDao { - - private static final String QUERY_USER_WITH_ROLE = "select u from User u left join fetch u.roleList order by u.id"; - private static final String COUNT_USERS = "select count(u) from User u"; - private static final String DISABLE_USERS = "update User u set u.status='disabled' where id in(:ids)"; - - /** - * 批量修改用户状态. - */ - public void disableUsers(List ids) { - Map> map = Collections.singletonMap("ids", ids); - batchExecute(UserHibernateDao.DISABLE_USERS, map); - } - - /** - * 使用 HQL 预加载lazy init的List,用DISTINCE_ROOT_ENTITY排除重复数据. - */ - - public List getAllUserWithRoleByDistinctHql() { - Query query = createQuery(QUERY_USER_WITH_ROLE); - return distinct(query).list(); - } - - /** - * 使用Criteria 预加载lazy init的List, 用DISTINCE_ROOT_ENTITY排除重复数据. - */ - - public List getAllUserWithRolesByDistinctCriteria() { - Criteria criteria = createCriteria().setFetchMode("roleList", FetchMode.JOIN); - return distinct(criteria).list(); - } - - /** - * 统计用户数. - */ - public Long getUserCount() { - return findUnique(UserHibernateDao.COUNT_USERS); - } - - /** - * 初始化User的延迟加载关联roleList. - */ - public void initUser(User user) { - initProxyObject(user.getRoleList()); - } -} diff --git a/examples/showcase/src/main/java/org/springside/examples/showcase/common/dao/UserJpaDao.java b/examples/showcase/src/main/java/org/springside/examples/showcase/common/dao/UserJpaDao.java new file mode 100644 index 00000000..e65ef0ed --- /dev/null +++ b/examples/showcase/src/main/java/org/springside/examples/showcase/common/dao/UserJpaDao.java @@ -0,0 +1,11 @@ +package org.springside.examples.showcase.common.dao; + +import org.springframework.data.repository.PagingAndSortingRepository; +import org.springside.examples.showcase.common.entity.User; + +public interface UserJpaDao extends PagingAndSortingRepository { + + User findByName(String name); + + User findByLoginName(String loginName); +} diff --git a/examples/showcase/src/main/java/org/springside/examples/showcase/common/service/AccountManager.java b/examples/showcase/src/main/java/org/springside/examples/showcase/common/service/AccountManager.java index 669b4c25..312ea7b3 100644 --- a/examples/showcase/src/main/java/org/springside/examples/showcase/common/service/AccountManager.java +++ b/examples/showcase/src/main/java/org/springside/examples/showcase/common/service/AccountManager.java @@ -9,13 +9,14 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; import org.springside.examples.showcase.cache.memcached.MemcachedObjectType; -import org.springside.examples.showcase.common.dao.UserHibernateDao; +import org.springside.examples.showcase.common.dao.UserJpaDao; import org.springside.examples.showcase.common.dao.UserMyBatisDao; import org.springside.examples.showcase.common.entity.User; import org.springside.examples.showcase.jms.simple.NotifyMessageProducer; import org.springside.examples.showcase.security.ShiroDbRealm; import org.springside.modules.mapper.JsonMapper; import org.springside.modules.memcached.SpyMemcachedClient; +import org.springside.modules.orm.jpa.JpaUtils; import org.springside.modules.utils.security.Digests; /** @@ -29,7 +30,7 @@ import org.springside.modules.utils.security.Digests; public class AccountManager { private static Logger logger = LoggerFactory.getLogger(AccountManager.class); - private UserHibernateDao userHibernateDao; + private UserJpaDao userJpaDao; private UserMyBatisDao userMyBatisDao; @@ -59,7 +60,7 @@ public class AccountManager { String shaPassword = Digests.sha1Hex(user.getPlainPassword()); user.setShaPassword(shaPassword); - userHibernateDao.save(user); + userJpaDao.save(user); if (shiroRealm != null) { shiroRealm.clearCachedAuthorizationInfo(user.getLoginName()); @@ -68,6 +69,10 @@ public class AccountManager { sendNotifyMessage(user); } + public List getAllUser() { + return (List) userJpaDao.findAll(); + } + /** * 判断是否超级管理员. */ @@ -76,13 +81,13 @@ public class AccountManager { } public User getUser(Long id) { - return userHibernateDao.get(id); + return userJpaDao.findOne(id); } /** - * 取得用户, 并对用户的延迟加载关联进行初始化. + * 取得用户,先尝试从缓存获取,然后用Mybatis查询. */ - public User getInitializedUser(Long id) { + public User getUserEffective(Long id) { if (memcachedClient != null) { return getUserFromMemcached(id); } else { @@ -117,30 +122,22 @@ public class AccountManager { /** * 按名称查询用户, 并对用户的延迟加载关联进行初始化. */ - public User searchInitializedUserByName(String name) { - User user = userHibernateDao.findUniqueBy("name", name); - userHibernateDao.initUser(user); - return user; - } + public User findUserByNameInitialized(String name) { + User user = userJpaDao.findByName(name); + JpaUtils.initLazyProperty(user.getRoleList()); - /** - * 取得所有用户, 预加载用户的角色. - */ - public List getAllUserWithRole() { - List list = userHibernateDao.getAllUserWithRoleByDistinctHql(); - logger.info("get {} user sucessful.", list.size()); - return list; + return user; } /** * 获取当前用户数量. */ public Long getUserCount() { - return userHibernateDao.getUserCount(); + return userJpaDao.count(); } public User findUserByLoginName(String loginName) { - return userHibernateDao.findUniqueBy("loginName", loginName); + return userJpaDao.findByLoginName(loginName); } /** @@ -160,8 +157,8 @@ public class AccountManager { } @Autowired - public void setUserHibernateDao(UserHibernateDao userDao) { - this.userHibernateDao = userDao; + public void setUserJpaDao(UserJpaDao userJpaDao) { + this.userJpaDao = userJpaDao; } @Autowired @@ -183,4 +180,5 @@ public class AccountManager { public void setShiroRealm(ShiroDbRealm shiroRealm) { this.shiroRealm = shiroRealm; } + } diff --git a/examples/showcase/src/main/java/org/springside/examples/showcase/common/web/UserController.java b/examples/showcase/src/main/java/org/springside/examples/showcase/common/web/UserController.java index db117def..e8265702 100644 --- a/examples/showcase/src/main/java/org/springside/examples/showcase/common/web/UserController.java +++ b/examples/showcase/src/main/java/org/springside/examples/showcase/common/web/UserController.java @@ -17,7 +17,7 @@ public class UserController { @RequestMapping(value = { "list", "" }) public String list(Model model) { - List users = accountManager.getAllUserWithRole(); + List users = accountManager.getAllUser(); model.addAttribute("users", users); return "common/userList"; } diff --git a/examples/showcase/src/main/java/org/springside/examples/showcase/webservice/rs/server/UserResourceService.java b/examples/showcase/src/main/java/org/springside/examples/showcase/webservice/rs/server/UserResourceService.java index 3c6fd011..7057d4bb 100644 --- a/examples/showcase/src/main/java/org/springside/examples/showcase/webservice/rs/server/UserResourceService.java +++ b/examples/showcase/src/main/java/org/springside/examples/showcase/webservice/rs/server/UserResourceService.java @@ -57,7 +57,7 @@ public class UserResourceService { @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML + WsConstants.CHARSET }) public List getAllUser() { try { - List entityList = accountManager.getAllUserWithRole(); + List entityList = accountManager.getAllUser(); return BeanMapper.mapList(entityList, UserDTO.class); } catch (RuntimeException e) { throw WebExceptionFactory.buildDefaultException(e, logger); @@ -72,7 +72,7 @@ public class UserResourceService { @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML + WsConstants.CHARSET }) public UserDTO getUser(@PathParam("id") Long id) { try { - User entity = accountManager.getInitializedUser(id); + User entity = accountManager.getUserEffective(id); return BeanMapper.map(entity, UserDTO.class); } catch (ObjectNotFoundException e) { String message = "用户不存在(id:" + id + ")"; @@ -93,7 +93,7 @@ public class UserResourceService { public Response searchUser(@QueryParam("name") String name, @QueryParam("format") @DefaultValue("json") String format) { try { - User entity = accountManager.searchInitializedUserByName(name); + User entity = accountManager.findUserByNameInitialized(name); if ("html".equals(format)) { //返回html格式的特定字符串. String html = "
" + entity.getName() + ", your mother call you...
"; diff --git a/examples/showcase/src/main/resources/META-INF/orm.xml b/examples/showcase/src/main/resources/META-INF/orm.xml new file mode 100644 index 00000000..9a2e1d95 --- /dev/null +++ b/examples/showcase/src/main/resources/META-INF/orm.xml @@ -0,0 +1,4 @@ + + + \ No newline at end of file diff --git a/examples/showcase/src/main/resources/META-INF/persistence.xml b/examples/showcase/src/main/resources/META-INF/persistence.xml new file mode 100644 index 00000000..e6d6e1d7 --- /dev/null +++ b/examples/showcase/src/main/resources/META-INF/persistence.xml @@ -0,0 +1,8 @@ + + + + + META-INF/orm.xml + + \ No newline at end of file diff --git a/examples/showcase/src/main/resources/applicationContext.xml b/examples/showcase/src/main/resources/applicationContext.xml index ccc161aa..180eaf7b 100644 --- a/examples/showcase/src/main/resources/applicationContext.xml +++ b/examples/showcase/src/main/resources/applicationContext.xml @@ -1,11 +1,13 @@ Spring公共配置 @@ -15,20 +17,26 @@ - - - - - - - + + + + + + ${hibernate.dialect} + org.hibernate.cache.EhCacheProvider + ehcache/ehcache-hibernate-local.xml + org.hibernate.cfg.ImprovedNamingStrategy - + + + + + @@ -36,9 +44,9 @@ - - - + + + @@ -86,7 +94,6 @@ - @@ -135,5 +142,4 @@ -
\ No newline at end of file diff --git a/examples/showcase/src/main/resources/security/applicationContext-shiro.xml b/examples/showcase/src/main/resources/security/applicationContext-shiro.xml index 4fb3c2f2..f32bd3f0 100644 --- a/examples/showcase/src/main/resources/security/applicationContext-shiro.xml +++ b/examples/showcase/src/main/resources/security/applicationContext-shiro.xml @@ -13,7 +13,7 @@ - + diff --git a/examples/showcase/src/main/webapp/WEB-INF/spring-mvc.xml b/examples/showcase/src/main/webapp/WEB-INF/spring-mvc.xml index 74cbc793..38e1929a 100644 --- a/examples/showcase/src/main/webapp/WEB-INF/spring-mvc.xml +++ b/examples/showcase/src/main/webapp/WEB-INF/spring-mvc.xml @@ -7,6 +7,7 @@ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd"> + diff --git a/examples/showcase/src/main/webapp/WEB-INF/web.xml b/examples/showcase/src/main/webapp/WEB-INF/web.xml index 224d047e..82d12aed 100644 --- a/examples/showcase/src/main/webapp/WEB-INF/web.xml +++ b/examples/showcase/src/main/webapp/WEB-INF/web.xml @@ -95,13 +95,13 @@ FORWARD - + - hibernateOpenSessionInViewFilter - org.springframework.orm.hibernate3.support.OpenSessionInViewFilter + openEntityManagerInViewFilter + org.springframework.orm.jpa.support.OpenEntityManagerInViewFilter - hibernateOpenSessionInViewFilter + openEntityManagerInViewFilter /common/* diff --git a/examples/showcase/src/test/java/org/springside/examples/showcase/common/AccountManagerTest.java b/examples/showcase/src/test/java/org/springside/examples/showcase/common/AccountManagerTest.java index c2df55ec..f0d700aa 100644 --- a/examples/showcase/src/test/java/org/springside/examples/showcase/common/AccountManagerTest.java +++ b/examples/showcase/src/test/java/org/springside/examples/showcase/common/AccountManagerTest.java @@ -7,7 +7,7 @@ import org.junit.Before; import org.junit.Test; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import org.springside.examples.showcase.common.dao.UserHibernateDao; +import org.springside.examples.showcase.common.dao.UserJpaDao; import org.springside.examples.showcase.common.entity.User; import org.springside.examples.showcase.common.service.AccountManager; import org.springside.examples.showcase.common.service.ServiceException; @@ -17,7 +17,7 @@ public class AccountManagerTest { private AccountManager accountManager; @Mock - private UserHibernateDao mockUserDao; + private UserJpaDao mockUserDao; @Before public void setUp() { @@ -25,7 +25,7 @@ public class AccountManagerTest { ShiroTestHelper.mockSubject("foo"); accountManager = new AccountManager(); - accountManager.setUserHibernateDao(mockUserDao); + accountManager.setUserJpaDao(mockUserDao); } @After diff --git a/examples/showcase/src/test/java/org/springside/examples/showcase/common/HibernateMappingTest.java b/examples/showcase/src/test/java/org/springside/examples/showcase/common/HibernateMappingTest.java deleted file mode 100644 index 399e06e6..00000000 --- a/examples/showcase/src/test/java/org/springside/examples/showcase/common/HibernateMappingTest.java +++ /dev/null @@ -1,49 +0,0 @@ -package org.springside.examples.showcase.common; - -import java.util.Map; - -import org.hibernate.Query; -import org.hibernate.Session; -import org.hibernate.SessionFactory; -import org.hibernate.persister.entity.EntityPersister; -import org.junit.Test; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.transaction.TransactionConfiguration; -import org.springside.modules.test.data.Fixtures; -import org.springside.modules.test.spring.SpringTxTestCase; - -/** - * 简单测试所有Entity类的O/R Mapping. - * - * @author calvin - */ -@ContextConfiguration(locations = { "/applicationContext.xml" }) -@TransactionConfiguration(transactionManager = "defaultTransactionManager") -public class HibernateMappingTest extends SpringTxTestCase { - private static Logger logger = LoggerFactory.getLogger(HibernateMappingTest.class); - - @Autowired - private SessionFactory sessionFactory; - - @Test - public void allClassMapping() throws Exception { - Fixtures.reloadAllTable(dataSource, "/data/sample-data.xml"); - - Session session = sessionFactory.openSession(); - try { - Map metadata = sessionFactory.getAllClassMetadata(); - for (Object o : metadata.values()) { - EntityPersister persister = (EntityPersister) o; - String className = persister.getEntityName(); - Query q = session.createQuery("from " + className + " c"); - q.iterate(); - logger.debug("ok: " + className); - } - } finally { - session.close(); - } - } -} diff --git a/examples/showcase/src/test/java/org/springside/examples/showcase/common/JpaMappingTest.java b/examples/showcase/src/test/java/org/springside/examples/showcase/common/JpaMappingTest.java new file mode 100644 index 00000000..16bd168e --- /dev/null +++ b/examples/showcase/src/test/java/org/springside/examples/showcase/common/JpaMappingTest.java @@ -0,0 +1,35 @@ +package org.springside.examples.showcase.common; + +import javax.persistence.EntityManager; +import javax.persistence.PersistenceContext; +import javax.persistence.metamodel.EntityType; +import javax.persistence.metamodel.Metamodel; + +import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.transaction.TransactionConfiguration; +import org.springside.modules.test.data.Fixtures; +import org.springside.modules.test.spring.SpringTxTestCase; + +@ContextConfiguration(locations = { "/applicationContext.xml" }) +@TransactionConfiguration() +public class JpaMappingTest extends SpringTxTestCase { + + private static Logger logger = LoggerFactory.getLogger(JpaMappingTest.class); + + @PersistenceContext + private EntityManager em; + + @Test + public void allClassMapping() throws Exception { + Fixtures.reloadAllTable(dataSource, "/data/sample-data.xml"); + Metamodel model = em.getEntityManagerFactory().getMetamodel(); + for (EntityType entityType : model.getEntities()) { + String entityName = entityType.getName(); + em.createQuery("select o from " + entityName + " o").getFirstResult(); + logger.info("ok: " + entityName); + } + } +} diff --git a/examples/showcase/src/test/java/org/springside/examples/showcase/common/UserHibernateDaoTest.java b/examples/showcase/src/test/java/org/springside/examples/showcase/common/UserHibernateDaoTest.java deleted file mode 100644 index 49cc00dc..00000000 --- a/examples/showcase/src/test/java/org/springside/examples/showcase/common/UserHibernateDaoTest.java +++ /dev/null @@ -1,61 +0,0 @@ -package org.springside.examples.showcase.common; - -import static org.junit.Assert.*; - -import java.util.List; - -import org.hibernate.Hibernate; -import org.junit.Before; -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.common.dao.UserHibernateDao; -import org.springside.examples.showcase.common.entity.User; -import org.springside.modules.test.data.Fixtures; -import org.springside.modules.test.spring.SpringTxTestCase; - -import com.google.common.collect.Lists; - -/** - * UserDao的集成测试用例,测试ORM映射及特殊的DAO操作. - * - * @author calvin - */ -@ContextConfiguration(locations = { "/applicationContext.xml" }) -//演示指定非默认名称的TransactionManager. -@TransactionConfiguration(transactionManager = "defaultTransactionManager") -public class UserHibernateDaoTest extends SpringTxTestCase { - - @Autowired - private UserHibernateDao userDao; - - @Before - public void reloadSampleData() throws Exception { - Fixtures.reloadAllTable(dataSource, "/data/sample-data.xml"); - } - - @Test - public void eagerFetchCollection() { - int userCount = countRowsInTable("SS_USER"); - //init by hql - List userList1 = userDao.getAllUserWithRoleByDistinctHql(); - assertEquals(userCount, userList1.size()); - assertTrue(Hibernate.isInitialized(userList1.get(0).getRoleList())); - - //init by criteria - List userList2 = userDao.getAllUserWithRolesByDistinctCriteria(); - assertEquals(userCount, userList2.size()); - assertTrue(Hibernate.isInitialized(userList2.get(0).getRoleList())); - } - - @Test - public void batchDisableUser() { - List ids = Lists.newArrayList(1L, 2L); - - userDao.disableUsers(ids); - - assertEquals("disabled", userDao.get(1L).getStatus()); - assertEquals("disabled", userDao.get(2L).getStatus()); - } -} diff --git a/modules/core/src/main/java/org/springside/modules/orm/jpa/JpaUtils.java b/modules/core/src/main/java/org/springside/modules/orm/jpa/JpaUtils.java new file mode 100644 index 00000000..b8ab4aa5 --- /dev/null +++ b/modules/core/src/main/java/org/springside/modules/orm/jpa/JpaUtils.java @@ -0,0 +1,10 @@ +package org.springside.modules.orm.jpa; + +import org.hibernate.Hibernate; + +public class JpaUtils { + + public static void initLazyProperty(Object proxyed) { + Hibernate.initialize(proxyed); + } +}