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

Merge remote-tracking branch 'origin/master' into 2849_add_new_mdm_param

This commit is contained in:
Nick Goupinets 2021-08-30 09:46:52 -04:00
parent 4e012236c2 281596d5f2
commit 528c429a4e
3 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/batch/CommonBatchJobConfig.java
View File

@ -22,6 +22,7 @@ package ca.uhn.fhir.jpa.batch;
import ca.uhn.fhir.jpa.batch.processor.GoldenResourceAnnotatingProcessor; import ca.uhn.fhir.jpa.batch.processor.GoldenResourceAnnotatingProcessor;
import ca.uhn.fhir.jpa.batch.processor.PidToIBaseResourceProcessor; import ca.uhn.fhir.jpa.batch.processor.PidToIBaseResourceProcessor;
import ca.uhn.fhir.jpa.reindex.job.ReindexWriter;
import org.springframework.batch.core.configuration.annotation.StepScope; import org.springframework.batch.core.configuration.annotation.StepScope;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
@ -41,4 +42,10 @@ public class CommonBatchJobConfig {
return new GoldenResourceAnnotatingProcessor(); return new GoldenResourceAnnotatingProcessor();
} }
@Bean
@StepScope
public ReindexWriter reindexWriter() {
return new ReindexWriter();
}
} }

10
hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/reindex/job/ReindexEverythingJobConfig.java
View File

@ -49,6 +49,8 @@ public class ReindexEverythingJobConfig {
private StepBuilderFactory myStepBuilderFactory; private StepBuilderFactory myStepBuilderFactory;
@Autowired @Autowired
private JobBuilderFactory myJobBuilderFactory; private JobBuilderFactory myJobBuilderFactory;
@Autowired
private ReindexWriter myReindexWriter;
@Bean(name = REINDEX_EVERYTHING_JOB_NAME) @Bean(name = REINDEX_EVERYTHING_JOB_NAME)
@Lazy @Lazy
@ -63,7 +65,7 @@ public class ReindexEverythingJobConfig {
return myStepBuilderFactory.get(REINDEX_EVERYTHING_STEP_NAME) return myStepBuilderFactory.get(REINDEX_EVERYTHING_STEP_NAME)
.<List<Long>, List<Long>>chunk(1) .<List<Long>, List<Long>>chunk(1)
.reader(cronologicalBatchAllResourcePidReader()) .reader(cronologicalBatchAllResourcePidReader())
.writer(reindexWriter()) .writer(myReindexWriter)
.listener(reindexEverythingPidCountRecorderListener()) .listener(reindexEverythingPidCountRecorderListener())
.listener(reindexEverythingPromotionListener()) .listener(reindexEverythingPromotionListener())
.build(); .build();
@ -75,12 +77,6 @@ public class ReindexEverythingJobConfig {
return new CronologicalBatchAllResourcePidReader(); return new CronologicalBatchAllResourcePidReader();
} }
@Bean
@StepScope
public ReindexWriter reindexWriter() {
return new ReindexWriter();
}
@Bean @Bean
@StepScope @StepScope
public PidReaderCounterListener reindexEverythingPidCountRecorderListener() { public PidReaderCounterListener reindexEverythingPidCountRecorderListener() {

10
hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/reindex/job/ReindexJobConfig.java
View File

@ -51,6 +51,8 @@ public class ReindexJobConfig extends MultiUrlProcessorJobConfig {
private StepBuilderFactory myStepBuilderFactory; private StepBuilderFactory myStepBuilderFactory;
@Autowired @Autowired
private JobBuilderFactory myJobBuilderFactory; private JobBuilderFactory myJobBuilderFactory;
@Autowired
private ReindexWriter myReindexWriter;
@Bean(name = REINDEX_JOB_NAME) @Bean(name = REINDEX_JOB_NAME)
@Lazy @Lazy
@ -66,18 +68,12 @@ public class ReindexJobConfig extends MultiUrlProcessorJobConfig {
return myStepBuilderFactory.get(REINDEX_URL_LIST_STEP_NAME) return myStepBuilderFactory.get(REINDEX_URL_LIST_STEP_NAME)
.<List<Long>, List<Long>>chunk(1) .<List<Long>, List<Long>>chunk(1)
.reader(reverseCronologicalBatchResourcePidReader()) .reader(reverseCronologicalBatchResourcePidReader())
.writer(reindexWriter()) .writer(myReindexWriter)
.listener(pidCountRecorderListener()) .listener(pidCountRecorderListener())
.listener(reindexPromotionListener()) .listener(reindexPromotionListener())
.build(); .build();
} }
@Bean
@StepScope
public ReindexWriter reindexWriter() {
return new ReindexWriter();
}
@Bean @Bean
public ExecutionContextPromotionListener reindexPromotionListener() { public ExecutionContextPromotionListener reindexPromotionListener() {
ExecutionContextPromotionListener listener = new ExecutionContextPromotionListener(); ExecutionContextPromotionListener listener = new ExecutionContextPromotionListener();