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

Fix compatibility with the latest Spring Boot

Browse Source 
https://build.spring.io/browse/INTSAMPLES-NIGHTLY-2099/
This commit is contained in:
Artem Bilan
2017-05-17 11:50:17 -04:00
parent e1be51feb1
commit 2ccc8f426c
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
basic/barrier/src/main/java/org/springframework/integration/samples/barrier/Application.java
View File

@@ -16,6 +16,8 @@
package org.springframework.integration.samples.barrier; package org.springframework.integration.samples.barrier;
import java.util.Collections;
import org.springframework.amqp.rabbit.connection.CachingConnectionFactory; import org.springframework.amqp.rabbit.connection.CachingConnectionFactory;
import org.springframework.boot.Banner.Mode; import org.springframework.boot.Banner.Mode;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
@@ -42,11 +44,15 @@ public class Application {
connectionFactory.resetConnection(); connectionFactory.resetConnection();
// https://github.com/spring-projects/spring-boot/issues/3945 // https://github.com/spring-projects/spring-boot/issues/3945
ConfigurableApplicationContext client SpringApplication application = new SpringApplicationBuilder()
= new SpringApplicationBuilder("/META-INF/spring/integration/client-context.xml")
.web(WebApplicationType.NONE) .web(WebApplicationType.NONE)
.bannerMode(Mode.OFF) .bannerMode(Mode.OFF)
.run(args); .application();
application.setSources(Collections.singleton("/META-INF/spring/integration/client-context.xml"));
ConfigurableApplicationContext client = application.run(args);
RequestGateway requestGateway = client.getBean("requestGateway", RequestGateway.class); RequestGateway requestGateway = client.getBean("requestGateway", RequestGateway.class);
String request = "A,B,C"; String request = "A,B,C";
System.out.println("\n\n++++++++++++ Sending: " + request + " ++++++++++++\n"); System.out.println("\n\n++++++++++++ Sending: " + request + " ++++++++++++\n");

4
intermediate/tcp-client-server-multiplex/src/test/java/org/springframework/integration/samples/tcpclientserver/TcpClientServerDemoTest.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2015 the original author or authors. * Copyright 2002-2017 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -96,7 +96,7 @@ public class TcpClientServerDemoTest {
} }
}); });
} }
assertTrue(latch.await(20, TimeUnit.SECONDS)); assertTrue(latch.await(60, TimeUnit.SECONDS));
assertEquals(0, results.size()); assertEquals(0, results.size());
} }