Spring/spring-data-rest
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make the EntityManagerFactory handling in the JpaHelper a little more robust.

Browse Source
This commit is contained in:
Jon Brisbin
2013-03-06 16:05:22 -06:00
parent 93d3214115
commit cc1573cb39
2 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/RepositoryRestHandlerMapping.java
View File

@@ -111,8 +111,9 @@ public class RepositoryRestHandlerMapping extends RequestMappingHandlerMapping {
@Override protected void extendInterceptors(List<Object> interceptors) {
if(null != jpaHelper) {
Object jpaInterceptor = jpaHelper.getInterceptor();
interceptors.add(jpaInterceptor);
for(Object o : jpaHelper.getInterceptors()) {
interceptors.add(o);
}
}
}

22
spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/support/JpaHelper.java
View File

@@ -1,8 +1,9 @@
package org.springframework.data.rest.webmvc.support;
import java.util.ArrayList;
import java.util.List;
import javax.persistence.EntityManagerFactory;
import org.springframework.beans.BeanInstantiationException;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.BeanFactoryAware;
@@ -15,26 +16,23 @@ import org.springframework.orm.jpa.support.OpenEntityManagerInViewInterceptor;
*/
public class JpaHelper implements BeanFactoryAware {
private Object interceptor = null;
private List interceptor = new ArrayList<Object>();
@SuppressWarnings({"unchecked"})
@Override public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
String[] beanNames = BeanFactoryUtils.beanNamesForTypeIncludingAncestors(
(ListableBeanFactory)beanFactory,
EntityManagerFactory.class
);
if(beanNames.length != 1) {
throw new BeanInstantiationException(JpaHelper.class,
String.format("Only one EntityManagerFactory expected but %s found",
beanNames.length));
for(String s : beanNames) {
EntityManagerFactory emf = (EntityManagerFactory)beanFactory.getBean(s);
OpenEntityManagerInViewInterceptor omivi = new OpenEntityManagerInViewInterceptor();
omivi.setEntityManagerFactory(emf);
interceptor.add(omivi);
}
String unitName = beanNames[0];
EntityManagerFactory emf = (EntityManagerFactory)beanFactory.getBean(unitName);
OpenEntityManagerInViewInterceptor omivi = new OpenEntityManagerInViewInterceptor();
omivi.setEntityManagerFactory(emf);
this.interceptor = omivi;
}
public Object getInterceptor() {
public List getInterceptors() {
return interceptor;
}