From e51c5b52630f11298112bde7f721ca80c0cc5e96 Mon Sep 17 00:00:00 2001
From: Tadgh <garygrantgraham@gmail.com>
Date: Wed, 24 Jun 2020 21:03:02 -0700
Subject: [PATCH] change transactionmanager name so it doesnt shadow the
 batchprocessing one

---
 .../src/main/java/ca/uhn/fhir/jpa/config/TestJpaConfig.java    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/config/TestJpaConfig.java b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/config/TestJpaConfig.java
index 62fd1e157b3..1ba10db64c7 100644
--- a/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/config/TestJpaConfig.java
+++ b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/config/TestJpaConfig.java
@@ -27,7 +27,6 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
 import org.springframework.orm.jpa.JpaTransactionManager;
-import org.springframework.transaction.PlatformTransactionManager;
 
 import javax.persistence.EntityManagerFactory;
 // TODO RC1 can use in jpa tests?
@@ -46,7 +45,7 @@ public class TestJpaConfig {
 
 	@Bean
 	@Primary
-	public PlatformTransactionManager hapiTransactionManager(EntityManagerFactory entityManagerFactory) {
+	public JpaTransactionManager hapiTransactionManager(EntityManagerFactory entityManagerFactory) {
 		JpaTransactionManager retVal = new JpaTransactionManager();
 		retVal.setEntityManagerFactory(entityManagerFactory);
 		return retVal;