From c9ef6fe19f8820a2a455231cf54372f38c20e8a5 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Mon, 30 Jul 2018 15:41:25 -0400 Subject: [PATCH] Fix `file-split-ftp` according latest Boot Spring Boot now doesn't allow by default to override beans in the application context * Add `spring.main.allow-bean-definition-overriding=true` to the test class definition to reflect the purpose of the downstream configurations --- .../integration/samples/filesplit/Application.java | 3 --- .../integration/samples/filesplit/ApplicationTests.java | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/applications/file-split-ftp/src/main/java/org/springframework/integration/samples/filesplit/Application.java b/applications/file-split-ftp/src/main/java/org/springframework/integration/samples/filesplit/Application.java index 9ef28d0b..92618fa4 100644 --- a/applications/file-split-ftp/src/main/java/org/springframework/integration/samples/filesplit/Application.java +++ b/applications/file-split-ftp/src/main/java/org/springframework/integration/samples/filesplit/Application.java @@ -139,7 +139,6 @@ public class Application { } @Bean - @ConditionalOnMissingBean public SessionFactory ftp1() { DefaultFtpSessionFactory ftp = new DefaultFtpSessionFactory(); ftp.setHost("host3"); @@ -149,7 +148,6 @@ public class Application { } @Bean - @ConditionalOnMissingBean public SessionFactory ftp2() { DefaultFtpSessionFactory ftp = new DefaultFtpSessionFactory(); ftp.setHost("host3"); @@ -159,7 +157,6 @@ public class Application { } @Bean - @ConditionalOnMissingBean public SessionFactory ftp3() { DefaultFtpSessionFactory ftp = new DefaultFtpSessionFactory(); ftp.setHost("host3"); diff --git a/applications/file-split-ftp/src/test/java/org/springframework/integration/samples/filesplit/ApplicationTests.java b/applications/file-split-ftp/src/test/java/org/springframework/integration/samples/filesplit/ApplicationTests.java index a53c1b36..a1a54ce9 100644 --- a/applications/file-split-ftp/src/test/java/org/springframework/integration/samples/filesplit/ApplicationTests.java +++ b/applications/file-split-ftp/src/test/java/org/springframework/integration/samples/filesplit/ApplicationTests.java @@ -56,7 +56,7 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit4.SpringRunner; @RunWith(SpringRunner.class) -@SpringBootTest(classes = { ApplicationTests.Config.class, Application.class }) +@SpringBootTest(properties = "spring.main.allow-bean-definition-overriding=true") @DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD) @SpringIntegrationTest(noAutoStartup = "fileInboundChannelAdapter") public class ApplicationTests {