diff --git a/projects/spring-cloud-stream/src/test/java/releaser/ReleaserApplicationTests.java b/projects/spring-cloud-stream/src/test/java/releaser/ReleaserApplicationTests.java index 6d0c2bf8..21e3527a 100644 --- a/projects/spring-cloud-stream/src/test/java/releaser/ReleaserApplicationTests.java +++ b/projects/spring-cloud-stream/src/test/java/releaser/ReleaserApplicationTests.java @@ -19,6 +19,7 @@ package releaser; import org.junit.jupiter.api.Test; import org.mockito.Mockito; import releaser.internal.options.Parser; +import releaser.internal.spring.BuildReportHandler; import releaser.internal.spring.ExecutionResultHandler; import releaser.internal.spring.SpringReleaser; @@ -49,6 +50,11 @@ class ReleaserApplicationTests { return Mockito.mock(ExecutionResultHandler.class); } + @Bean + BuildReportHandler mockBuildReportHandler() { + return Mockito.mock(BuildReportHandler.class); + } + @Bean Parser mockParser() { return Mockito.mock(Parser.class); diff --git a/projects/spring-cloud/src/test/java/releaser/ReleaserApplicationTests.java b/projects/spring-cloud/src/test/java/releaser/ReleaserApplicationTests.java index 6d0c2bf8..21e3527a 100644 --- a/projects/spring-cloud/src/test/java/releaser/ReleaserApplicationTests.java +++ b/projects/spring-cloud/src/test/java/releaser/ReleaserApplicationTests.java @@ -19,6 +19,7 @@ package releaser; import org.junit.jupiter.api.Test; import org.mockito.Mockito; import releaser.internal.options.Parser; +import releaser.internal.spring.BuildReportHandler; import releaser.internal.spring.ExecutionResultHandler; import releaser.internal.spring.SpringReleaser; @@ -49,6 +50,11 @@ class ReleaserApplicationTests { return Mockito.mock(ExecutionResultHandler.class); } + @Bean + BuildReportHandler mockBuildReportHandler() { + return Mockito.mock(BuildReportHandler.class); + } + @Bean Parser mockParser() { return Mockito.mock(Parser.class); diff --git a/projects/spring-cloud/src/test/java/releaser/cloud/spring/meta/SpringMetaReleaseAcceptanceTests.java b/projects/spring-cloud/src/test/java/releaser/cloud/spring/meta/SpringMetaReleaseAcceptanceTests.java index 17ab10fb..df06c48e 100644 --- a/projects/spring-cloud/src/test/java/releaser/cloud/spring/meta/SpringMetaReleaseAcceptanceTests.java +++ b/projects/spring-cloud/src/test/java/releaser/cloud/spring/meta/SpringMetaReleaseAcceptanceTests.java @@ -369,7 +369,8 @@ public class SpringMetaReleaseAcceptanceTests .getBean(TestExecutionResultHandler.class); FirstTask firstTask = context.getBean(FirstTask.class); SecondTask secondTask = context.getBean(SecondTask.class); - PostReleaseTask postReleaseTask = context.getBean(PostReleaseTask.class); + PostReleaseTask postReleaseTask = context + .getBean(PostReleaseTask.class); ExecutionResult result = releaser .release(new OptionsBuilder().metaRelease(true).options()); diff --git a/releaser-spring/src/main/java/releaser/internal/spring/BatchConfiguration.java b/releaser-spring/src/main/java/releaser/internal/spring/BatchConfiguration.java index 79c5e6a7..a1cf7c13 100644 --- a/releaser-spring/src/main/java/releaser/internal/spring/BatchConfiguration.java +++ b/releaser-spring/src/main/java/releaser/internal/spring/BatchConfiguration.java @@ -56,8 +56,15 @@ class BatchConfiguration { @Bean @ConditionalOnMissingBean - SpringBatchExecutionResultHandler springBatchExecutionResultHandler( - JobExplorer jobExplorer, ConfigurableApplicationContext context) { + BuildReportHandler springBuildReportHandler(JobExplorer jobExplorer, + ConfigurableApplicationContext context) { + return new SpringBatchExecutionResultHandler(jobExplorer, context); + } + + @Bean + @ConditionalOnMissingBean + ExecutionResultHandler springBatchExecutionResultHandler(JobExplorer jobExplorer, + ConfigurableApplicationContext context) { return new SpringBatchExecutionResultHandler(jobExplorer, context); } diff --git a/releaser-test/src/main/java/releaser/internal/spring/AbstractSpringAcceptanceTests.java b/releaser-test/src/main/java/releaser/internal/spring/AbstractSpringAcceptanceTests.java index debf62d0..13d297da 100644 --- a/releaser-test/src/main/java/releaser/internal/spring/AbstractSpringAcceptanceTests.java +++ b/releaser-test/src/main/java/releaser/internal/spring/AbstractSpringAcceptanceTests.java @@ -378,10 +378,10 @@ public abstract class AbstractSpringAcceptanceTests { ProjectsToRunFactory projectsToRunFactory, JobLauncher jobLauncher, FlowRunnerTaskExecutorSupplier flowRunnerTaskExecutorSupplier, ConfigurableApplicationContext context, - ReleaserProperties releaserProperties) { + ReleaserProperties releaserProperties, BuildReportHandler reportHandler) { return new SpringBatchFlowRunner(stepBuilderFactory, jobBuilderFactory, projectsToRunFactory, jobLauncher, flowRunnerTaskExecutorSupplier, - context, releaserProperties) { + context, releaserProperties, reportHandler) { @Override Decision decide(Options options, ReleaserTask task) { return Decision.CONTINUE;