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

Wip getting tasks built

This commit is contained in:
Tadgh 2020-06-01 11:32:36 -07:00
parent a306825625
commit aa7d1cbcb7
4 changed files with 13 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hapi-fhir-jpaserver-base/pom.xml
View File

@ -149,6 +149,7 @@
<dependency> <dependency>
<groupId>ca.uhn.hapi.fhir</groupId> <groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-fhir-jpaserver-batch</artifactId> <artifactId>hapi-fhir-jpaserver-batch</artifactId>
<version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>

20
hapi-fhir-jpaserver-batch/pom.xml
View File

@ -16,11 +16,6 @@
<name>HAPI FHIR JPA Server - Batch Task Processor</name> <name>HAPI FHIR JPA Server - Batch Task Processor</name>
<dependencies> <dependencies>
<dependency>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-fhir-jpaserver-migrate</artifactId>
<version>${project.version}</version>
</dependency>
<dependency> <dependency>
<groupId>org.springframework.batch</groupId> <groupId>org.springframework.batch</groupId>
<artifactId>spring-batch-core</artifactId> <artifactId>spring-batch-core</artifactId>
@ -55,14 +50,19 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>ca.uhn.hapi.fhir</groupId> <groupId>org.awaitility</groupId>
<artifactId>hapi-fhir-jpaserver-test-utilities</artifactId> <artifactId>awaitility</artifactId>
<version>${project.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.awaitility</groupId> <groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>awaitility</artifactId> <artifactId>hapi-fhir-test-utilities</artifactId>
<version>5.1.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>

21
hapi-fhir-jpaserver-batch/src/test/java/ca/uhn/fhir/jpa/batch/BaseBatchR4Test.java
View File

@ -1,16 +1,9 @@
package ca.uhn.fhir.jpa.batch; package ca.uhn.fhir.jpa.batch;
import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.context.FhirContext;
import ca.uhn.fhir.jpa.api.dao.IFhirResourceDao;
import ca.uhn.fhir.jpa.batch.config.BatchJobConfig; import ca.uhn.fhir.jpa.batch.config.BatchJobConfig;
import ca.uhn.fhir.jpa.batch.config.InMemoryJobRepositoryBatchConfig; import ca.uhn.fhir.jpa.batch.config.InMemoryJobRepositoryBatchConfig;
import ca.uhn.fhir.jpa.batch.svc.DummyService; import ca.uhn.fhir.jpa.batch.svc.DummyService;
import ca.uhn.fhir.jpa.config.TestJpaR4Config;
import ca.uhn.fhir.jpa.dao.index.IdHelperService;
import ca.uhn.fhir.jpa.test.BaseJpaR4Test;
import org.hl7.fhir.r4.model.Patient;
import org.hl7.fhir.r4.model.Person;
import org.hl7.fhir.r4.model.Practitioner;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.springframework.batch.core.Job; import org.springframework.batch.core.Job;
@ -23,23 +16,13 @@ import org.springframework.transaction.PlatformTransactionManager;
import static org.slf4j.LoggerFactory.getLogger; import static org.slf4j.LoggerFactory.getLogger;
@RunWith(SpringRunner.class) @RunWith(SpringRunner.class)
@ContextConfiguration(classes = {BatchJobConfig.class, InMemoryJobRepositoryBatchConfig.class, TestJpaR4Config.class}) @ContextConfiguration(classes = {BatchJobConfig.class, InMemoryJobRepositoryBatchConfig.class})
abstract public class BaseBatchR4Test extends BaseJpaR4Test { abstract public class BaseBatchR4Test {
private static final Logger ourLog = getLogger(BaseBatchR4Test.class); private static final Logger ourLog = getLogger(BaseBatchR4Test.class);
@Autowired @Autowired
protected PlatformTransactionManager myPlatformTransactionManager; protected PlatformTransactionManager myPlatformTransactionManager;
@Autowired
protected FhirContext myFhirContext;
@Autowired
protected IFhirResourceDao<Person> myPersonDao;
@Autowired
protected IFhirResourceDao<Patient> myPatientDao;
@Autowired
protected IFhirResourceDao<Practitioner> myPractitionerDao;
@Autowired
protected IdHelperService myIdHelperService;
@Autowired @Autowired
protected DummyService myDummyService; protected DummyService myDummyService;
@Autowired @Autowired

7
hapi-fhir-jpaserver-migrate/pom.xml
View File

@ -42,13 +42,6 @@
<artifactId>hapi-fhir-jpaserver-base</artifactId> <artifactId>hapi-fhir-jpaserver-base</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<!-- Need this for the schema files from spring batch -->
<dependency>
<groupId>org.springframework.batch</groupId>
<artifactId>spring-batch-core</artifactId>
<version>4.2.2.RELEASE</version>
</dependency>
<!-- Test Database --> <!-- Test Database -->
<dependency> <dependency>
<groupId>com.h2database</groupId> <groupId>com.h2database</groupId>