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

only register mdm clear job definition if it is not registered yet (#3740) 

Co-authored-by: Ken Stevens <ken@smilecdr.com>
This commit is contained in:
Ken Stevens 2022-06-26 14:10:42 -04:00 committed by GitHub
parent 49d298dba1
commit c3f34099fb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
hapi-fhir-storage-batch2/src/main/java/ca/uhn/fhir/batch2/coordinator/JobDefinitionRegistry.java
View File

@ -44,6 +44,21 @@ public class JobDefinitionRegistry {
private final Map<String, TreeMap<Integer, JobDefinition<?>>> myJobs = new HashMap<>();
/**
* Add a job definition only if it is not registered
* @param theDefinition
* @return true if it did not already exist and was registered
* @param <PT> the job parameter type for the definition
*/
public <PT extends IModelJson> boolean addJobDefinitionIfNotRegistered(@Nonnull JobDefinition<PT> theDefinition) {
Optional<JobDefinition<?>> orig = getJobDefinition(theDefinition.getJobDefinitionId(), theDefinition.getJobDefinitionVersion());
if (orig.isPresent()) {
return false;
}
addJobDefinition(theDefinition);
return true;
}
public <PT extends IModelJson> void addJobDefinition(@Nonnull JobDefinition<PT> theDefinition) {
Validate.notNull(theDefinition);
String jobDefinitionId = theDefinition.getJobDefinitionId();

2
hapi-fhir-storage-mdm/src/main/java/ca/uhn/fhir/mdm/batch2/MdmBatch2Config.java
View File

@ -24,6 +24,6 @@ public class MdmBatch2Config {
@PostConstruct
public void start() {
JobDefinition jobDefinition = myApplicationContext.getBean(MDM_CLEAR_JOB_BEAN_NAME, JobDefinition.class);
myJobDefinitionRegistry.addJobDefinition(jobDefinition);
myJobDefinitionRegistry.addJobDefinitionIfNotRegistered(jobDefinition);
}
}