Specify the bean names for the flows

EBIvariation · Jun 27, 2024 · 49a0a8b · 49a0a8b
1 parent eb1e126
commit 49a0a8b
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 27 deletions.
diff --git a/...ession-release/src/main/java/uk/ac/ebi/eva/accession/release/configuration/BeanNames.java b/...ession-release/src/main/java/uk/ac/ebi/eva/accession/release/configuration/BeanNames.java
@@ -17,7 +17,23 @@
 
 public class BeanNames {
 
-// common beans
+    public static final String ACTIVE_ACCESSION_RELEASE_EVA_FLOW = "ACTIVE_ACCESSION_RELEASE_EVA_FLOW";
+
+    public static final String ACTIVE_ACCESSION_RELEASE_DBSNP_FLOW = "ACTIVE_ACCESSION_RELEASE_DBSNP_FLOW";
+
+    public static final String MERGED_ACCESSION_RELEASE_EVA_FLOW = "MERGED_ACCESSION_RELEASE_EVA_FLOW";
+
+    public static final String MERGED_ACCESSION_RELEASE_DBSNP_FLOW = "MERGED_ACCESSION_RELEASE_DBSNP_FLOW";
+
+    public static final String DEPRECATED_ACCESSION_RELEASE_EVA_FLOW = "DEPRECATED_ACCESSION_RELEASE_EVA_FLOW";
+
+    public static final String DEPRECATED_ACCESSION_RELEASE_DBSNP_FLOW = "DEPRECATED_ACCESSION_RELEASE_DBSNP_FLOW";
+
+    public static final String MERGED_DEPRECATED_ACCESSION_RELEASE_EVA_FLOW = "MERGED_DEPRECATED_ACCESSION_RELEASE_EVA_FLOW";
+
+    public static final String MERGED_DEPRECATED_ACCESSION_RELEASE_DBSNP_FLOW = "MERGED_DEPRECATED_ACCESSION_RELEASE_DBSNP_FLOW";
+
+    // common beans
     public static final String ACTIVE_ACCESSION_RELEASE_JOB = "ACTIVE_ACCESSION_RELEASE_JOB";
 
     public static final String MERGED_ACCESSION_RELEASE_JOB = "MERGED_ACCESSION_RELEASE_JOB";

diff --git a/...va/accession/release/configuration/batch/jobs/ActiveAccessionReleaseJobConfiguration.java b/...va/accession/release/configuration/batch/jobs/ActiveAccessionReleaseJobConfiguration.java
@@ -46,8 +46,8 @@ public class ActiveAccessionReleaseJobConfiguration {
 
     @Bean(ACTIVE_ACCESSION_RELEASE_JOB)
     public Job ActiveAccessionReleaseJob(JobBuilderFactory jobBuilderFactory,
-                                   Flow dbsnpFlow,
-                                   Flow evaFlow) {
+                                         @Qualifier(ACTIVE_ACCESSION_RELEASE_DBSNP_FLOW) Flow dbsnpFlow,
+                                         @Qualifier(ACTIVE_ACCESSION_RELEASE_EVA_FLOW) Flow evaFlow) {
         FlowBuilder<FlowJobBuilder> flowBuilder = jobBuilderFactory.get(ACTIVE_ACCESSION_RELEASE_JOB)
                                                                    .incrementer(new RunIdIncrementer())
                                                                    .start(dbsnpFlow)
@@ -56,7 +56,7 @@ public Job ActiveAccessionReleaseJob(JobBuilderFactory jobBuilderFactory,
         return jobBuilder.build();
     }
 
-    @Bean
+    @Bean(ACTIVE_ACCESSION_RELEASE_DBSNP_FLOW)
     public Flow dbsnpFlow(
             @Qualifier(LIST_DBSNP_ACTIVE_CONTIGS_STEP) Step listActiveContigsStep,
             @Qualifier(RELEASE_DBSNP_MAPPED_ACTIVE_VARIANTS_STEP) Step createReleaseStep) {
@@ -66,7 +66,7 @@ public Flow dbsnpFlow(
                 .build();
     }
 
-    @Bean
+    @Bean(ACTIVE_ACCESSION_RELEASE_EVA_FLOW)
     public Flow evaFlow(
             @Qualifier(LIST_EVA_ACTIVE_CONTIGS_STEP) Step listActiveContigsStep,
             @Qualifier(RELEASE_EVA_MAPPED_ACTIVE_VARIANTS_STEP) Step createReleaseStep) {

diff --git a/...ccession/release/configuration/batch/jobs/DeprecatedAccessionReleaseJobConfiguration.java b/...ccession/release/configuration/batch/jobs/DeprecatedAccessionReleaseJobConfiguration.java
@@ -46,8 +46,8 @@ public class DeprecatedAccessionReleaseJobConfiguration {
      */
     @Bean(DEPRECATED_ACCESSION_RELEASE_JOB)
     public Job accessionReleaseJob(JobBuilderFactory jobBuilderFactory,
-                                   Flow dbsnpFlow,
-                                   Flow evaFlow) {
+                                   @Qualifier(DEPRECATED_ACCESSION_RELEASE_DBSNP_FLOW) Flow dbsnpFlow,
+                                   @Qualifier(DEPRECATED_ACCESSION_RELEASE_EVA_FLOW) Flow evaFlow) {
         FlowBuilder<FlowJobBuilder> flowBuilder = jobBuilderFactory.get(DEPRECATED_ACCESSION_RELEASE_JOB)
                                                                    .incrementer(new RunIdIncrementer())
                                                                    .start(dbsnpFlow)
@@ -56,15 +56,15 @@ public Job accessionReleaseJob(JobBuilderFactory jobBuilderFactory,
         return jobBuilder.build();
     }
 
-    @Bean
+    @Bean(DEPRECATED_ACCESSION_RELEASE_DBSNP_FLOW)
     public Flow dbsnpFlow(
             @Qualifier(RELEASE_DBSNP_MAPPED_DEPRECATED_VARIANTS_STEP) Step createDeprecatedReleaseStep) {
         return new FlowBuilder<Flow>(DBSNP_FLOW)
                 .start(createDeprecatedReleaseStep)
                 .build();
     }
 
-    @Bean
+    @Bean(DEPRECATED_ACCESSION_RELEASE_EVA_FLOW)
     public Flow evaFlow(@Qualifier(RELEASE_EVA_MAPPED_DEPRECATED_VARIANTS_STEP) Step createDeprecatedReleaseStep) {
         return new FlowBuilder<Flow>(EVA_FLOW)
                 .start(createDeprecatedReleaseStep)

diff --git a/...va/accession/release/configuration/batch/jobs/MergedAccessionReleaseJobConfiguration.java b/...va/accession/release/configuration/batch/jobs/MergedAccessionReleaseJobConfiguration.java
@@ -28,11 +28,7 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
-import uk.ac.ebi.eva.accession.release.configuration.batch.steps.CreateDeprecatedReleaseStepConfiguration;
-import uk.ac.ebi.eva.accession.release.configuration.batch.steps.CreateMergedDeprecatedReleaseStepConfiguration;
 import uk.ac.ebi.eva.accession.release.configuration.batch.steps.CreateMergedReleaseStepConfiguration;
-import uk.ac.ebi.eva.accession.release.configuration.batch.steps.CreateMultimapReleaseStepConfiguration;
-import uk.ac.ebi.eva.accession.release.configuration.batch.steps.CreateReleaseStepConfiguration;
 import uk.ac.ebi.eva.accession.release.configuration.batch.steps.ListContigsStepConfiguration;
 
 import static uk.ac.ebi.eva.accession.release.configuration.BeanNames.*;
@@ -45,8 +41,8 @@ public class MergedAccessionReleaseJobConfiguration {
 
     @Bean(MERGED_ACCESSION_RELEASE_JOB)
     public Job accessionReleaseJob(JobBuilderFactory jobBuilderFactory,
-                                   Flow dbsnpFlow,
-                                   Flow evaFlow) {
+                                   @Qualifier(MERGED_ACCESSION_RELEASE_DBSNP_FLOW) Flow dbsnpFlow,
+                                   @Qualifier(MERGED_ACCESSION_RELEASE_EVA_FLOW)Flow evaFlow) {
         FlowBuilder<FlowJobBuilder> flowBuilder = jobBuilderFactory.get(MERGED_ACCESSION_RELEASE_JOB)
                                                                    .incrementer(new RunIdIncrementer())
                                                                    .start(dbsnpFlow)
@@ -55,7 +51,7 @@ public Job accessionReleaseJob(JobBuilderFactory jobBuilderFactory,
         return jobBuilder.build();
     }
 
-    @Bean
+    @Bean(MERGED_ACCESSION_RELEASE_DBSNP_FLOW)
     public Flow dbsnpFlow(
             @Qualifier(LIST_DBSNP_MERGED_CONTIGS_STEP) Step listMergedContigsStep,
             @Qualifier(RELEASE_DBSNP_MAPPED_MERGED_VARIANTS_STEP) Step createMergedReleaseStep) {
@@ -65,7 +61,7 @@ public Flow dbsnpFlow(
                 .build();
     }
 
-    @Bean
+    @Bean(MERGED_ACCESSION_RELEASE_EVA_FLOW)
     public Flow evaFlow(
             @Qualifier(LIST_EVA_MERGED_CONTIGS_STEP) Step listMergedContigsStep,
             @Qualifier(RELEASE_EVA_MAPPED_MERGED_VARIANTS_STEP) Step createMergedReleaseStep) {

diff --git a/...on/release/configuration/batch/jobs/MergedDeprecatedAccessionReleaseJobConfiguration.java b/...on/release/configuration/batch/jobs/MergedDeprecatedAccessionReleaseJobConfiguration.java
@@ -39,12 +39,7 @@
 
 @Configuration
 @EnableBatchProcessing
-@Import({ListContigsStepConfiguration.class,
-         CreateReleaseStepConfiguration.class,
-         CreateDeprecatedReleaseStepConfiguration.class,
-         CreateMergedDeprecatedReleaseStepConfiguration.class,
-         CreateMergedReleaseStepConfiguration.class,
-         CreateMultimapReleaseStepConfiguration.class})
+@Import({CreateMergedDeprecatedReleaseStepConfiguration.class})
 public class MergedDeprecatedAccessionReleaseJobConfiguration {
 
     /**
@@ -54,8 +49,8 @@ public class MergedDeprecatedAccessionReleaseJobConfiguration {
      */
     @Bean(MERGED_DEPRECATED_ACCESSION_RELEASE_JOB)
     public Job accessionReleaseJob(JobBuilderFactory jobBuilderFactory,
-                                   Flow dbsnpFlow,
-                                   Flow evaFlow) {
+                                   @Qualifier(MERGED_DEPRECATED_ACCESSION_RELEASE_DBSNP_FLOW) Flow dbsnpFlow,
+                                   @Qualifier(MERGED_DEPRECATED_ACCESSION_RELEASE_EVA_FLOW) Flow evaFlow) {
         FlowBuilder<FlowJobBuilder> flowBuilder = jobBuilderFactory.get(MERGED_DEPRECATED_ACCESSION_RELEASE_JOB)
                                                                    .incrementer(new RunIdIncrementer())
                                                                    .start(dbsnpFlow)
@@ -64,15 +59,15 @@ public Job accessionReleaseJob(JobBuilderFactory jobBuilderFactory,
         return jobBuilder.build();
     }
 
-    @Bean
+    @Bean(MERGED_DEPRECATED_ACCESSION_RELEASE_DBSNP_FLOW)
     public Flow dbsnpFlow(
             @Qualifier(RELEASE_DBSNP_MAPPED_MERGED_DEPRECATED_VARIANTS_STEP) Step createMergedDeprecatedReleaseStep) {
         return new FlowBuilder<Flow>(DBSNP_FLOW)
                 .start(createMergedDeprecatedReleaseStep)
                 .build();
     }
 
-    @Bean
+    @Bean(MERGED_DEPRECATED_ACCESSION_RELEASE_EVA_FLOW)
     public Flow evaFlow(
             @Qualifier(RELEASE_EVA_MAPPED_MERGED_DEPRECATED_VARIANTS_STEP) Step createMergedDeprecatedReleaseStep) {
         return new FlowBuilder<Flow>(EVA_FLOW)