Spring/spring-integration-samples
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix file-split-ftp according latest Boot

Browse Source 
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
This commit is contained in:
Artem Bilan
2018-07-30 15:41:25 -04:00
parent c0f406dc5e
commit c9ef6fe19f
2 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
applications/file-split-ftp/src/main/java/org/springframework/integration/samples/filesplit/Application.java
View File

@@ -139,7 +139,6 @@ public class Application {
}
@Bean
@ConditionalOnMissingBean
public SessionFactory<FTPFile> ftp1() {
DefaultFtpSessionFactory ftp = new DefaultFtpSessionFactory();
ftp.setHost("host3");
@@ -149,7 +148,6 @@ public class Application {
}
@Bean
@ConditionalOnMissingBean
public SessionFactory<FTPFile> ftp2() {
DefaultFtpSessionFactory ftp = new DefaultFtpSessionFactory();
ftp.setHost("host3");
@@ -159,7 +157,6 @@ public class Application {
}
@Bean
@ConditionalOnMissingBean
public SessionFactory<FTPFile> ftp3() {
DefaultFtpSessionFactory ftp = new DefaultFtpSessionFactory();
ftp.setHost("host3");

2
applications/file-split-ftp/src/test/java/org/springframework/integration/samples/filesplit/ApplicationTests.java
View File

@@ -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 {