honeymoose
/
hapi-fhir
mirror of https://github.com/hapifhir/hapi-fhir.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

change transactionmanager name so it doesnt shadow the batchprocessing one

This commit is contained in:
Tadgh 2020-06-24 21:03:02 -07:00
parent 06e1368388
commit e51c5b5263
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/config/TestJpaConfig.java
View File

@ -27,7 +27,6 @@ import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Primary; import org.springframework.context.annotation.Primary;
import org.springframework.orm.jpa.JpaTransactionManager; import org.springframework.orm.jpa.JpaTransactionManager;
import org.springframework.transaction.PlatformTransactionManager;
import javax.persistence.EntityManagerFactory; import javax.persistence.EntityManagerFactory;
// TODO RC1 can use in jpa tests? // TODO RC1 can use in jpa tests?
@ -46,7 +45,7 @@ public class TestJpaConfig {
@Bean @Bean
@Primary @Primary
public PlatformTransactionManager hapiTransactionManager(EntityManagerFactory entityManagerFactory) { public JpaTransactionManager hapiTransactionManager(EntityManagerFactory entityManagerFactory) {
JpaTransactionManager retVal = new JpaTransactionManager(); JpaTransactionManager retVal = new JpaTransactionManager();
retVal.setEntityManagerFactory(entityManagerFactory); retVal.setEntityManagerFactory(entityManagerFactory);
return retVal; return retVal;