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

Rename methods to prevent duplicate bean names (#6098)

This commit is contained in:
Renaud Subiger 2024-07-12 03:05:38 +02:00 committed by GitHub
parent bd31bcb290
commit 40d42f3ba5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/expunge/DeleteExpungeAppCtx.java
View File

@ -65,7 +65,7 @@ public class DeleteExpungeAppCtx {
"load-ids", "load-ids",
"Load IDs of resources to expunge", "Load IDs of resources to expunge",
ResourceIdListWorkChunkJson.class, ResourceIdListWorkChunkJson.class,
loadIdsStep(theBatch2DaoSvc)) expungeLoadIdsStep(theBatch2DaoSvc))
.addLastStep( .addLastStep(
"expunge", "expunge",
"Perform the resource expunge", "Perform the resource expunge",
@ -85,7 +85,7 @@ public class DeleteExpungeAppCtx {
} }
@Bean @Bean
public LoadIdsStep<DeleteExpungeJobParameters> loadIdsStep(IBatch2DaoSvc theBatch2DaoSvc) { public LoadIdsStep<DeleteExpungeJobParameters> expungeLoadIdsStep(IBatch2DaoSvc theBatch2DaoSvc) {
return new LoadIdsStep<>(theBatch2DaoSvc); return new LoadIdsStep<>(theBatch2DaoSvc);
} }

4
hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/reindex/ReindexAppCtx.java
View File

@ -59,7 +59,7 @@ public class ReindexAppCtx {
"load-ids", "load-ids",
"Load IDs of resources to reindex", "Load IDs of resources to reindex",
ResourceIdListWorkChunkJson.class, ResourceIdListWorkChunkJson.class,
loadIdsStep(theBatch2DaoSvc)) reindexLoadIdsStep(theBatch2DaoSvc))
.addLastStep("reindex", "Perform the resource reindex", reindexStep()) .addLastStep("reindex", "Perform the resource reindex", reindexStep())
.build(); .build();
} }
@ -70,7 +70,7 @@ public class ReindexAppCtx {
} }
@Bean @Bean
public IJobStepWorker<ReindexJobParameters, ChunkRangeJson, ResourceIdListWorkChunkJson> loadIdsStep( public IJobStepWorker<ReindexJobParameters, ChunkRangeJson, ResourceIdListWorkChunkJson> reindexLoadIdsStep(
IBatch2DaoSvc theBatch2DaoSvc) { IBatch2DaoSvc theBatch2DaoSvc) {
return new LoadIdsStep<>(theBatch2DaoSvc); return new LoadIdsStep<>(theBatch2DaoSvc);
} }

7
hapi-fhir-storage-mdm/src/main/java/ca/uhn/fhir/mdm/batch2/submit/MdmSubmitAppCtx.java
View File

@ -58,7 +58,10 @@ public class MdmSubmitAppCtx {
ChunkRangeJson.class, ChunkRangeJson.class,
submitGenerateRangeChunksStep()) submitGenerateRangeChunksStep())
.addIntermediateStep( .addIntermediateStep(
"load-ids", "Load the IDs", ResourceIdListWorkChunkJson.class, loadIdsStep(theBatch2DaoSvc)) "load-ids",
"Load the IDs",
ResourceIdListWorkChunkJson.class,
mdmSubmitLoadIdsStep(theBatch2DaoSvc))
.addLastStep( .addLastStep(
"inflate-and-submit-resources", "inflate-and-submit-resources",
"Inflate and Submit resources", "Inflate and Submit resources",
@ -78,7 +81,7 @@ public class MdmSubmitAppCtx {
} }
@Bean @Bean
public LoadIdsStep<MdmSubmitJobParameters> loadIdsStep(IBatch2DaoSvc theBatch2DaoSvc) { public LoadIdsStep<MdmSubmitJobParameters> mdmSubmitLoadIdsStep(IBatch2DaoSvc theBatch2DaoSvc) {
return new LoadIdsStep<>(theBatch2DaoSvc); return new LoadIdsStep<>(theBatch2DaoSvc);
} }