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

Fix deprecation warnings

Browse Source 
* Use `MatcherAssert.assertThat()`
instead of deprecated `Assert.assertThat()`
* Use `IntegrationFlows.fromSupplier(Supplier)`
instead of removed `IntegrationFlows.from(Supplier)`
* Use `org.springframework.integration:spring-integration-test`
throughout the project for more testing utilities
This commit is contained in:
Artem Bilan
2020-06-29 11:00:32 -04:00
parent cb9f6eb0a5
commit 21e44479ee
87 changed files with 438 additions and 564 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
intermediate/async-gateway/pom.xml
View File

@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>async-gateway</artifactId>
<version>5.3.0.RELEASE</version>
<version>5.4.0</version>
<name>Async Gateway Sample</name>
<description>Async Gateway Sample</description>
<url>https://projects.spring.io/spring-integration</url>
@@ -123,8 +123,8 @@
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-test</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -158,14 +158,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.2.7.RELEASE</version>
<version>5.3.0-M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.3.1.RELEASE</version>
<version>5.4.0-M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

10
intermediate/async-gateway/src/test/java/org/springframework/integration/samples/async/gateway/MonoTest.java → intermediate/async-gateway/src/test/java/org/springframework/integration/samples/async/gateway/MonoGatewayTests.java
View File

@@ -16,8 +16,8 @@
package org.springframework.integration.samples.async.gateway;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.greaterThanOrEqualTo;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
import java.util.Random;
@@ -53,12 +53,12 @@ import reactor.core.scheduler.Schedulers;
* @author Gary Russell
*
*/
@ContextConfiguration(classes = MonoTest.TestConfig.class)
@ContextConfiguration(classes = MonoGatewayTests.TestConfig.class)
@RunWith(SpringJUnit4ClassRunner.class)
@DirtiesContext
public class MonoTest {
public class MonoGatewayTests {
private static Log logger = LogFactory.getLog(MonoTest.class);
private static Log logger = LogFactory.getLog(MonoGatewayTests.class);
@Autowired
private MathGateway gateway;
@@ -79,7 +79,7 @@ public class MonoTest {
for (int i = 0; i < 100; i++) {
final int number = numbers[i];
gateway.multiplyByTwo(number)
.subscribeOn(Schedulers.elastic())
.subscribeOn(Schedulers.boundedElastic())
.filter(p -> p != null)
.doOnNext(result1 -> {
logger.info("Result of multiplication of " + number + " by 2 is " + result1);

10
intermediate/dynamic-poller/pom.xml
View File

@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>dynamic-poller</artifactId>
<version>5.3.0.RELEASE</version>
<version>5.4.0</version>
<name>Dynamic Poller Sample</name>
<description>Dynamic Poller Sample</description>
<url>https://projects.spring.io/spring-integration</url>
@@ -123,8 +123,8 @@
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-test</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -158,14 +158,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.2.7.RELEASE</version>
<version>5.3.0-M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.3.1.RELEASE</version>
<version>5.4.0-M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

10
intermediate/errorhandling/pom.xml
View File

@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>errorhandling</artifactId>
<version>5.3.0.RELEASE</version>
<version>5.4.0</version>
<name>Error Handling Sample</name>
<description>Error Handling Sample</description>
<url>https://projects.spring.io/spring-integration</url>
@@ -123,8 +123,8 @@
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-test</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -158,14 +158,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.2.7.RELEASE</version>
<version>5.3.0-M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.3.1.RELEASE</version>
<version>5.4.0-M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

10
intermediate/file-processing/pom.xml
View File

@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>file-processing</artifactId>
<version>5.3.0.RELEASE</version>
<version>5.4.0</version>
<name>File Processing Sample</name>
<description>File Processing Sample</description>
<url>https://projects.spring.io/spring-integration</url>
@@ -123,8 +123,8 @@
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-test</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -158,14 +158,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.2.7.RELEASE</version>
<version>5.3.0-M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.3.1.RELEASE</version>
<version>5.4.0-M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

17
intermediate/mail-attachments/pom.xml
View File

@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>mail-attachments</artifactId>
<version>5.3.0.RELEASE</version>
<version>5.4.0</version>
<name>Mail Attachment Sample</name>
<description>Mail Attachment Sample</description>
<url>https://projects.spring.io/spring-integration</url>
@@ -169,17 +169,6 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>jackson-module-kotlin</artifactId>
<groupId>com.fasterxml.jackson.module</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-test</artifactId>
@@ -228,14 +217,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.2.7.RELEASE</version>
<version>5.3.0-M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.3.1.RELEASE</version>
<version>5.4.0-M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

10
intermediate/monitoring/pom.xml
View File

@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>monitoring</artifactId>
<version>5.3.0.RELEASE</version>
<version>5.4.0</version>
<name>Monitoring Application</name>
<description>Monitoring Application</description>
<url>https://projects.spring.io/spring-integration</url>
@@ -169,8 +169,8 @@
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-test</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -204,14 +204,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.2.7.RELEASE</version>
<version>5.3.0-M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.3.1.RELEASE</version>
<version>5.4.0-M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

10
intermediate/multipart-http/pom.xml
View File

@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>multipart-http</artifactId>
<version>5.3.0.RELEASE</version>
<version>5.4.0</version>
<name>HTTP Multipart Demo</name>
<description>HTTP Multipart Demo</description>
<url>https://projects.spring.io/spring-integration</url>
@@ -169,8 +169,8 @@
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-test</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -204,14 +204,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.2.7.RELEASE</version>
<version>5.3.0-M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.3.1.RELEASE</version>
<version>5.4.0-M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

2
intermediate/pom.xml
View File

@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>intermediate</artifactId>
<version>5.3.0.RELEASE</version>
<version>5.4.0</version>
<url>https://projects.spring.io/spring-integration</url>
<organization>
<name>SpringIO</name>

14
intermediate/rest-http/pom.xml
View File

@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>rest-http</artifactId>
<version>5.3.0.RELEASE</version>
<version>5.4.0</version>
<name>Spring Integration Rest HTTP Path Usage Demo</name>
<description>Spring Integration Rest HTTP Path Usage Demo</description>
<url>https://projects.spring.io/spring-integration</url>
@@ -146,7 +146,7 @@
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-web</artifactId>
<version>5.3.3.RELEASE</version>
<version>5.4.0-M1</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -158,7 +158,7 @@
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-config</artifactId>
<version>5.3.3.RELEASE</version>
<version>5.4.0-M1</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -224,8 +224,8 @@
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-test</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -259,14 +259,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.2.7.RELEASE</version>
<version>5.3.0-M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.3.1.RELEASE</version>
<version>5.4.0-M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

10
intermediate/retry-and-more/pom.xml
View File

@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>retry-and-more</artifactId>
<version>5.3.0.RELEASE</version>
<version>5.4.0</version>
<name>Retry and More Sample</name>
<description>Retry and More Sample</description>
<url>https://projects.spring.io/spring-integration</url>
@@ -156,8 +156,8 @@
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-test</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -191,14 +191,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.2.7.RELEASE</version>
<version>5.3.0-M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.3.1.RELEASE</version>
<version>5.4.0-M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

10
intermediate/splitter-aggregator-reaper/pom.xml
View File

@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>splitter-aggregator-reaper</artifactId>
<version>5.3.0.RELEASE</version>
<version>5.4.0</version>
<name>Splitter-Aggregator-Reaper Sample</name>
<description>Splitter-Aggregator-Reaper Sample</description>
<url>https://projects.spring.io/spring-integration</url>
@@ -135,8 +135,8 @@
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-test</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -170,14 +170,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.2.7.RELEASE</version>
<version>5.3.0-M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.3.1.RELEASE</version>
<version>5.4.0-M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

10
intermediate/stored-procedures-derby/pom.xml
View File

@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>stored-procedures-derby</artifactId>
<version>5.3.0.RELEASE</version>
<version>5.4.0</version>
<name>Derby Stored Procedures Sample</name>
<description>Derby Stored Procedures Sample</description>
<url>https://projects.spring.io/spring-integration</url>
@@ -135,8 +135,8 @@
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-test</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -170,14 +170,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.2.7.RELEASE</version>
<version>5.3.0-M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.3.1.RELEASE</version>
<version>5.4.0-M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

10
intermediate/stored-procedures-ms/pom.xml
View File

@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>stored-procedures-ms</artifactId>
<version>5.3.0.RELEASE</version>
<version>5.4.0</version>
<name>MS SQLServer Stored Procedures Sample</name>
<description>MS SQLServer Stored Procedures Sample</description>
<url>https://projects.spring.io/spring-integration</url>
@@ -147,8 +147,8 @@
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-test</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -182,14 +182,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.2.7.RELEASE</version>
<version>5.3.0-M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.3.1.RELEASE</version>
<version>5.4.0-M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

10
intermediate/stored-procedures-oracle/pom.xml
View File

@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>stored-procedures-oracle</artifactId>
<version>5.3.0.RELEASE</version>
<version>5.4.0</version>
<name>Oracle Stored Procedures Sample</name>
<description>Oracle Stored Procedures Sample</description>
<url>https://projects.spring.io/spring-integration</url>
@@ -123,8 +123,8 @@
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-test</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -158,14 +158,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.2.7.RELEASE</version>
<version>5.3.0-M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.3.1.RELEASE</version>
<version>5.4.0-M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

10
intermediate/stored-procedures-postgresql/pom.xml
View File

@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>stored-procedures-postgresql</artifactId>
<version>5.3.0.RELEASE</version>
<version>5.4.0</version>
<name>PostgreSQL Stored Procedures Sample</name>
<description>PostgreSQL Stored Procedures Sample</description>
<url>https://projects.spring.io/spring-integration</url>
@@ -159,8 +159,8 @@
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-test</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -194,14 +194,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.2.7.RELEASE</version>
<version>5.3.0-M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.3.1.RELEASE</version>
<version>5.4.0-M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

25
intermediate/tcp-async-bi-directional/pom.xml
View File

@@ -4,11 +4,11 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.3.1.RELEASE</version>
<version>2.4.0-SNAPSHOT</version>
</parent>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>tcp-async-bi-directional</artifactId>
<version>5.3.0.RELEASE</version>
<version>5.4.0</version>
<name>Bi-Directional TCP Sample</name>
<description>Bi-Directional TCP Sample</description>
<url>https://projects.spring.io/spring-integration</url>
@@ -127,8 +127,8 @@
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-test</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -148,17 +148,6 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-test</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>jackson-module-kotlin</artifactId>
<groupId>com.fasterxml.jackson.module</groupId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
<repositories>
<repository>
@@ -185,7 +174,7 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>2.3.1.RELEASE</version>
<version>2.4.0-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>
@@ -199,14 +188,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.2.7.RELEASE</version>
<version>5.3.0-M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.3.1.RELEASE</version>
<version>5.4.0-M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

6
intermediate/tcp-async-bi-directional/src/main/java/org/springframework/integration/samples/tcpasyncbi/TcpAsyncBiDirectionalApplication.java
View File

@@ -66,7 +66,7 @@ class ClientPeer {
@Bean
public IntegrationFlow client1Out(AbstractClientConnectionFactory client1) {
return IntegrationFlows.from(() -> "Hello from client1", e -> e.id("client1Adapter")
return IntegrationFlows.fromSupplier(() -> "Hello from client1", e -> e.id("client1Adapter")
.poller(Pollers.fixedDelay(3000)))
.handle(Tcp.outboundAdapter(client1))
.get();
@@ -87,7 +87,7 @@ class ClientPeer {
@Bean
public IntegrationFlow client2Out(AbstractClientConnectionFactory client2) {
return IntegrationFlows.from(() -> "Hello from client2", e -> e.id("client2Adapter")
return IntegrationFlows.fromSupplier(() -> "Hello from client2", e -> e.id("client2Adapter")
.poller(Pollers.fixedDelay(2000)))
.handle(Tcp.outboundAdapter(client2))
.get();
@@ -123,7 +123,7 @@ class ServerPeer {
@Bean
public IntegrationFlow serverOut(AbstractServerConnectionFactory server) {
return IntegrationFlows.from(() -> "seed", e -> e.poller(Pollers.fixedDelay(5000)))
return IntegrationFlows.fromSupplier(() -> "seed", e -> e.poller(Pollers.fixedDelay(5000)))
.split(this.clients, "iterator")
.enrichHeaders(h -> h.headerExpression(IpHeaders.CONNECTION_ID, "payload"))
.transform(p -> "Hello from server")

17
intermediate/tcp-client-server-multiplex/pom.xml
View File

@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>tcp-client-server-multiplex</artifactId>
<version>5.3.0.RELEASE</version>
<version>5.4.0</version>
<name>TCP Client Server Multiplexing Sample</name>
<description>TCP Client Server Multiplexing Sample</description>
<url>https://projects.spring.io/spring-integration</url>
@@ -122,17 +122,6 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>jackson-module-kotlin</artifactId>
<groupId>com.fasterxml.jackson.module</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-test</artifactId>
@@ -169,14 +158,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.2.7.RELEASE</version>
<version>5.3.0-M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.3.1.RELEASE</version>
<version>5.4.0-M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

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

@@ -16,9 +16,9 @@
package org.springframework.integration.samples.tcpclientserver;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.containsString;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;

27
intermediate/testcontainers-rabbitmq/pom.xml
View File

@@ -4,11 +4,11 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.3.1.RELEASE</version>
<version>2.4.0-SNAPSHOT</version>
</parent>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>testcontainers-rabbitmq</artifactId>
<version>5.3.0.RELEASE</version>
<version>5.4.0</version>
<name>Testcontainers RabbitMQ Sample</name>
<description>Testcontainers RabbitMQ Sample</description>
<url>https://projects.spring.io/spring-integration</url>
@@ -138,8 +138,8 @@
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-test</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -163,17 +163,6 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-test</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
<artifactId>jackson-module-kotlin</artifactId>
<groupId>com.fasterxml.jackson.module</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework.amqp</groupId>
<artifactId>spring-rabbit-test</artifactId>
@@ -246,14 +235,14 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dependencies</artifactId>
<version>Hoxton.SR3</version>
<version>2020.0.0-M2</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>2.3.1.RELEASE</version>
<version>2.4.0-SNAPSHOT</version>
<scope>import</scope>
<type>pom</type>
</dependency>
@@ -267,14 +256,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.2.7.RELEASE</version>
<version>5.3.0-M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.3.1.RELEASE</version>
<version>5.4.0-M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

10
intermediate/travel/pom.xml
View File

@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>travel</artifactId>
<version>5.3.0.RELEASE</version>
<version>5.4.0</version>
<name>Travel Services Sample</name>
<description>Travel Services Sample</description>
<url>https://projects.spring.io/spring-integration</url>
@@ -145,8 +145,8 @@
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-test</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -180,14 +180,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.2.7.RELEASE</version>
<version>5.3.0-M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.3.1.RELEASE</version>
<version>5.4.0-M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>

10
intermediate/tx-synch/pom.xml
View File

@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.springframework.integration.samples</groupId>
<artifactId>tx-synch</artifactId>
<version>5.3.0.RELEASE</version>
<version>5.4.0</version>
<name>Transaction Synchronization Sample</name>
<description>Transaction Synchronization Sample</description>
<url>https://projects.spring.io/spring-integration</url>
@@ -146,8 +146,8 @@
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-test</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -181,14 +181,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.2.7.RELEASE</version>
<version>5.3.0-M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.3.1.RELEASE</version>
<version>5.4.0-M1</version>
<scope>import</scope>
<type>pom</type>
</dependency>