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

GH-3623: Deprecarte an IntegrationFlows

Browse Source 
Fixes https://github.com/spring-projects/spring-integration/issues/3623

* `IntegrationFlow` refactoring
* Apply several code style improvements and good practices
* Code style: no empty lines for methods javadocs
* make deprecated implementation reuse actual one instead of the copy-paste approach
* add whats-new comments
* Fix whats-new page according to standards
This commit is contained in:
Artem Vozhdayenko
2022-07-05 22:47:30 +03:00
committed by GitHub
parent 63759d76b9
commit 53dd050c5b
90 changed files with 796 additions and 570 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
spring-integration-rsocket/src/test/java/org/springframework/integration/rsocket/dsl/RSocketDslTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2019-2021 the original author or authors.
* Copyright 2019-2022 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -29,7 +29,6 @@ import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.integration.config.EnableIntegration;
import org.springframework.integration.dsl.IntegrationFlow;
import org.springframework.integration.dsl.IntegrationFlows;
import org.springframework.integration.dsl.context.IntegrationFlowContext;
import org.springframework.integration.rsocket.ClientRSocketConnector;
import org.springframework.integration.rsocket.RSocketInteractionModel;
@@ -129,7 +128,7 @@ public class RSocketDslTests {
@Bean
public IntegrationFlow rsocketUpperCaseRequestFlow(ClientRSocketConnector clientRSocketConnector) {
return IntegrationFlows
return IntegrationFlow
.from(Function.class)
.handle(RSockets.outboundGateway(message ->
message.getHeaders().getOrDefault("route", "/uppercase"))
@@ -145,7 +144,7 @@ public class RSocketDslTests {
@Bean
public IntegrationFlow rsocketUpperCaseFlow() {
return IntegrationFlows
return IntegrationFlow
.from(RSockets.inboundGateway("/uppercase")
.interactionModels(RSocketInteractionModel.requestChannel))
.<Flux<String>, Flux<String>>transform((flux) -> flux.map(String::toUpperCase))
@@ -154,7 +153,7 @@ public class RSocketDslTests {
@Bean
public IntegrationFlow rsocketUpperCaseWholeFlow() {
return IntegrationFlows
return IntegrationFlow
.from(RSockets.inboundGateway("/uppercaseWhole")
.interactionModels(RSocketInteractionModel.requestChannel)
.decodeFluxAsUnit(true))
@@ -164,7 +163,7 @@ public class RSocketDslTests {
@Bean
public IntegrationFlow rsocketLowerCaseFlow() {
return IntegrationFlows
return IntegrationFlow
.from(RSockets.inboundGateway("/lowercase"))
.<Flux<String>, Flux<String>>transform((flux) -> flux.map(String::toLowerCase))
.get();

3
spring-integration-rsocket/src/test/java/org/springframework/integration/rsocket/outbound/RSocketOutboundGatewayIntegrationTests.java
View File

@@ -34,7 +34,6 @@ import org.springframework.integration.channel.FluxMessageChannel;
import org.springframework.integration.channel.QueueChannel;
import org.springframework.integration.config.EnableIntegration;
import org.springframework.integration.dsl.IntegrationFlow;
import org.springframework.integration.dsl.IntegrationFlows;
import org.springframework.integration.dsl.MessageChannels;
import org.springframework.integration.expression.FunctionExpression;
import org.springframework.integration.rsocket.ClientRSocketConnector;
@@ -501,7 +500,7 @@ public class RSocketOutboundGatewayIntegrationTests {
@Bean
public IntegrationFlow rsocketOutboundFlow() {
return IntegrationFlows.from(MessageChannels.flux("inputChannel"))
return IntegrationFlow.from(MessageChannels.flux("inputChannel"))
.handle(rsocketOutboundGateway())
.channel(c -> c.flux("resultChannel"))
.get();