diff --git a/advanced/advanced-testing-examples/pom.xml b/advanced/advanced-testing-examples/pom.xml index 5ae68360..834e8f09 100644 --- a/advanced/advanced-testing-examples/pom.xml +++ b/advanced/advanced-testing-examples/pom.xml @@ -144,7 +144,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/advanced/dynamic-ftp/pom.xml b/advanced/dynamic-ftp/pom.xml index 61cfa6fe..4bbbaaa6 100644 --- a/advanced/dynamic-ftp/pom.xml +++ b/advanced/dynamic-ftp/pom.xml @@ -133,7 +133,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/advanced/dynamic-tcp-client/pom.xml b/advanced/dynamic-tcp-client/pom.xml index dbf3fd90..b7660acc 100644 --- a/advanced/dynamic-tcp-client/pom.xml +++ b/advanced/dynamic-tcp-client/pom.xml @@ -145,7 +145,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/applications/cafe-scripted/pom.xml b/applications/cafe-scripted/pom.xml index 98fc9b32..e90f48bc 100644 --- a/applications/cafe-scripted/pom.xml +++ b/applications/cafe-scripted/pom.xml @@ -166,7 +166,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/applications/cafe/cafe-amqp/pom.xml b/applications/cafe/cafe-amqp/pom.xml index 5291c084..47b918e3 100644 --- a/applications/cafe/cafe-amqp/pom.xml +++ b/applications/cafe/cafe-amqp/pom.xml @@ -139,7 +139,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/applications/cafe/cafe-jms/pom.xml b/applications/cafe/cafe-jms/pom.xml index 2e78641f..198ced86 100644 --- a/applications/cafe/cafe-jms/pom.xml +++ b/applications/cafe/cafe-jms/pom.xml @@ -163,7 +163,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/applications/cafe/cafe-si/pom.xml b/applications/cafe/cafe-si/pom.xml index 1cb6e579..ebca7244 100644 --- a/applications/cafe/cafe-si/pom.xml +++ b/applications/cafe/cafe-si/pom.xml @@ -138,7 +138,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/applications/file-split-ftp/pom.xml b/applications/file-split-ftp/pom.xml index 89fa7300..17334617 100644 --- a/applications/file-split-ftp/pom.xml +++ b/applications/file-split-ftp/pom.xml @@ -172,7 +172,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom 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 ec3bf54f..4cbe36f5 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 @@ -29,7 +29,6 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.mail.MailProperties; import org.springframework.context.annotation.Bean; import org.springframework.integration.dsl.IntegrationFlow; -import org.springframework.integration.dsl.IntegrationFlows; import org.springframework.integration.dsl.Pollers; import org.springframework.integration.file.FileHeaders; import org.springframework.integration.file.FileWritingMessageHandler; diff --git a/applications/loan-broker/pom.xml b/applications/loan-broker/pom.xml index a76f05a2..be30a60f 100644 --- a/applications/loan-broker/pom.xml +++ b/applications/loan-broker/pom.xml @@ -133,7 +133,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/applications/loanshark/pom.xml b/applications/loanshark/pom.xml index 1342e378..b5c29417 100644 --- a/applications/loanshark/pom.xml +++ b/applications/loanshark/pom.xml @@ -332,7 +332,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/applications/stomp-chat/pom.xml b/applications/stomp-chat/pom.xml index 1fc2d898..eacaba9b 100644 --- a/applications/stomp-chat/pom.xml +++ b/applications/stomp-chat/pom.xml @@ -155,7 +155,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/basic/amqp/pom.xml b/basic/amqp/pom.xml index 585529c6..3fd26539 100644 --- a/basic/amqp/pom.xml +++ b/basic/amqp/pom.xml @@ -144,7 +144,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/basic/barrier/pom.xml b/basic/barrier/pom.xml index a72ea9b7..246872bf 100644 --- a/basic/barrier/pom.xml +++ b/basic/barrier/pom.xml @@ -160,7 +160,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/basic/control-bus/pom.xml b/basic/control-bus/pom.xml index 4a7b76ca..65510ef0 100644 --- a/basic/control-bus/pom.xml +++ b/basic/control-bus/pom.xml @@ -133,7 +133,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/basic/enricher/pom.xml b/basic/enricher/pom.xml index 1484b7be..2c15ec5a 100644 --- a/basic/enricher/pom.xml +++ b/basic/enricher/pom.xml @@ -139,7 +139,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/basic/feed/pom.xml b/basic/feed/pom.xml index 2e8e28b3..97a6a53f 100644 --- a/basic/feed/pom.xml +++ b/basic/feed/pom.xml @@ -133,7 +133,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/basic/file/pom.xml b/basic/file/pom.xml index 57fc3aca..5322473e 100644 --- a/basic/file/pom.xml +++ b/basic/file/pom.xml @@ -133,7 +133,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/basic/ftp/pom.xml b/basic/ftp/pom.xml index ebb5ae42..c85f18db 100644 --- a/basic/ftp/pom.xml +++ b/basic/ftp/pom.xml @@ -157,7 +157,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/basic/helloworld/pom.xml b/basic/helloworld/pom.xml index 1e60ad46..0e8ddd62 100644 --- a/basic/helloworld/pom.xml +++ b/basic/helloworld/pom.xml @@ -133,7 +133,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/basic/http/pom.xml b/basic/http/pom.xml index 2d3bf78d..0595860e 100644 --- a/basic/http/pom.xml +++ b/basic/http/pom.xml @@ -193,7 +193,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/basic/jdbc/pom.xml b/basic/jdbc/pom.xml index 5fc58196..e60c0650 100644 --- a/basic/jdbc/pom.xml +++ b/basic/jdbc/pom.xml @@ -139,7 +139,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/basic/jms/pom.xml b/basic/jms/pom.xml index 1fc6a721..55c8651d 100644 --- a/basic/jms/pom.xml +++ b/basic/jms/pom.xml @@ -162,7 +162,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/basic/jmx/pom.xml b/basic/jmx/pom.xml index 0430b577..90da9ed2 100644 --- a/basic/jmx/pom.xml +++ b/basic/jmx/pom.xml @@ -138,7 +138,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/basic/jpa/pom.xml b/basic/jpa/pom.xml index daf3192b..b2c2618c 100644 --- a/basic/jpa/pom.xml +++ b/basic/jpa/pom.xml @@ -162,7 +162,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/basic/kafka/pom.xml b/basic/kafka/pom.xml index edd0d7ee..e51cab3c 100644 --- a/basic/kafka/pom.xml +++ b/basic/kafka/pom.xml @@ -162,7 +162,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/basic/kafka/src/main/java/org/springframework/integration/samples/kafka/Application.java b/basic/kafka/src/main/java/org/springframework/integration/samples/kafka/Application.java index 4fb71317..37533990 100644 --- a/basic/kafka/src/main/java/org/springframework/integration/samples/kafka/Application.java +++ b/basic/kafka/src/main/java/org/springframework/integration/samples/kafka/Application.java @@ -35,7 +35,6 @@ import org.springframework.expression.common.LiteralExpression; import org.springframework.integration.annotation.ServiceActivator; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.dsl.IntegrationFlow; -import org.springframework.integration.dsl.IntegrationFlows; import org.springframework.integration.dsl.context.IntegrationFlowContext; import org.springframework.integration.kafka.dsl.Kafka; import org.springframework.integration.kafka.inbound.KafkaMessageDrivenChannelAdapter; @@ -70,8 +69,8 @@ public class Application { public static void main(String[] args) throws Exception { ConfigurableApplicationContext context = new SpringApplicationBuilder(Application.class) - .web(WebApplicationType.NONE) - .run(args); + .web(WebApplicationType.NONE) + .run(args); context.getBean(Application.class).runDemo(context); context.close(); } @@ -96,12 +95,12 @@ public class Application { addAnotherListenerForTopics(this.properties.getNewTopic()); headers = Collections.singletonMap(KafkaHeaders.TOPIC, this.properties.getNewTopic()); for (int i = 0; i < 10; i++) { - toKafka.send(new GenericMessage<>("bar" + i, headers)); + toKafka.send(new GenericMessage<>("bar" + i, headers)); } received = fromKafka.receive(10000); count = 0; while (received != null) { - System.out.println(received); + System.out.println(received); received = fromKafka.receive(++count < 10 ? 10000 : 1000); } } @@ -139,7 +138,7 @@ public class Application { @Bean public KafkaMessageDrivenChannelAdapter - adapter(KafkaMessageListenerContainer container) { + adapter(KafkaMessageListenerContainer container) { KafkaMessageDrivenChannelAdapter kafkaMessageDrivenChannelAdapter = new KafkaMessageDrivenChannelAdapter<>(container); kafkaMessageDrivenChannelAdapter.setOutputChannel(fromKafka()); @@ -177,11 +176,11 @@ public class Application { consumerProperties.put(ConsumerConfig.GROUP_ID_CONFIG, consumerProperties.get(ConsumerConfig.GROUP_ID_CONFIG) + "x"); IntegrationFlow flow = - IntegrationFlows - .from(Kafka.messageDrivenChannelAdapter( - new DefaultKafkaConsumerFactory(consumerProperties), topics)) - .channel("fromKafka") - .get(); + IntegrationFlow + .from(Kafka.messageDrivenChannelAdapter( + new DefaultKafkaConsumerFactory(consumerProperties), topics)) + .channel("fromKafka") + .get(); this.flowContext.registration(flow).register(); } diff --git a/basic/mail/pom.xml b/basic/mail/pom.xml index 5d60a39d..447802ab 100644 --- a/basic/mail/pom.xml +++ b/basic/mail/pom.xml @@ -144,7 +144,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/basic/mongodb/pom.xml b/basic/mongodb/pom.xml index d372658f..c4c7a221 100644 --- a/basic/mongodb/pom.xml +++ b/basic/mongodb/pom.xml @@ -139,7 +139,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/basic/mqtt/pom.xml b/basic/mqtt/pom.xml index 8e48f297..d05febe4 100644 --- a/basic/mqtt/pom.xml +++ b/basic/mqtt/pom.xml @@ -150,7 +150,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/basic/mqtt/src/main/java/org/springframework/integration/samples/mqtt/Application.java b/basic/mqtt/src/main/java/org/springframework/integration/samples/mqtt/Application.java index e7274aa0..d2e93459 100644 --- a/basic/mqtt/src/main/java/org/springframework/integration/samples/mqtt/Application.java +++ b/basic/mqtt/src/main/java/org/springframework/integration/samples/mqtt/Application.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.integration.samples.mqtt; import org.apache.commons.logging.Log; @@ -23,7 +24,6 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.context.annotation.Bean; import org.springframework.integration.dsl.IntegrationFlow; -import org.springframework.integration.dsl.IntegrationFlows; import org.springframework.integration.dsl.Pollers; import org.springframework.integration.endpoint.MessageProducerSupport; import org.springframework.integration.handler.LoggingHandler; @@ -54,24 +54,24 @@ public class Application { public static void main(final String... args) { LOGGER.info("\n=========================================================" - + "\n " - + "\n Welcome to Spring Integration! " - + "\n " - + "\n For more information please visit: " - + "\n https://spring.io/projects/spring-integration " - + "\n " - + "\n=========================================================" ); + + "\n " + + "\n Welcome to Spring Integration! " + + "\n " + + "\n For more information please visit: " + + "\n https://spring.io/projects/spring-integration " + + "\n " + + "\n========================================================="); LOGGER.info("\n=========================================================" - + "\n " - + "\n This is the MQTT Sample - " - + "\n " - + "\n Please enter some text and press return. The entered " - + "\n Message will be sent to the configured MQTT topic, " - + "\n then again immediately retrieved from the Message " - + "\n Broker and ultimately printed to the command line. " - + "\n " - + "\n=========================================================" ); + + "\n " + + "\n This is the MQTT Sample - " + + "\n " + + "\n Please enter some text and press return. The entered " + + "\n Message will be sent to the configured MQTT topic, " + + "\n then again immediately retrieved from the Message " + + "\n Broker and ultimately printed to the command line. " + + "\n " + + "\n========================================================="); SpringApplication.run(Application.class, args); } @@ -80,7 +80,7 @@ public class Application { public MqttPahoClientFactory mqttClientFactory() { DefaultMqttPahoClientFactory factory = new DefaultMqttPahoClientFactory(); MqttConnectOptions options = new MqttConnectOptions(); - options.setServerURIs(new String[] { "tcp://localhost:1883" }); + options.setServerURIs(new String[]{ "tcp://localhost:1883" }); options.setUserName("guest"); options.setPassword("guest".toCharArray()); factory.setConnectionOptions(options); @@ -91,7 +91,7 @@ public class Application { @Bean public IntegrationFlow mqttOutFlow() { - return IntegrationFlows.from(CharacterStreamReadingMessageSource.stdin(), + return IntegrationFlow.from(CharacterStreamReadingMessageSource.stdin(), e -> e.poller(Pollers.fixedDelay(1000))) .transform(p -> p + " sent to MQTT") .handle(mqttOutbound()) @@ -110,7 +110,7 @@ public class Application { @Bean public IntegrationFlow mqttInFlow() { - return IntegrationFlows.from(mqttInbound()) + return IntegrationFlow.from(mqttInbound()) .transform(p -> p + ", received from MQTT") .handle(logger()) .get(); diff --git a/basic/oddeven/pom.xml b/basic/oddeven/pom.xml index 315a7e46..c2a099ac 100644 --- a/basic/oddeven/pom.xml +++ b/basic/oddeven/pom.xml @@ -133,7 +133,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/basic/quote/pom.xml b/basic/quote/pom.xml index 531059fe..c33cac93 100644 --- a/basic/quote/pom.xml +++ b/basic/quote/pom.xml @@ -133,7 +133,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/basic/sftp/pom.xml b/basic/sftp/pom.xml index 9f66f62d..2200c61d 100644 --- a/basic/sftp/pom.xml +++ b/basic/sftp/pom.xml @@ -139,7 +139,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/basic/tcp-amqp/pom.xml b/basic/tcp-amqp/pom.xml index 93931f4c..7f300698 100644 --- a/basic/tcp-amqp/pom.xml +++ b/basic/tcp-amqp/pom.xml @@ -150,7 +150,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/basic/tcp-broadcast/pom.xml b/basic/tcp-broadcast/pom.xml index bcaa24e0..6ae7f10d 100644 --- a/basic/tcp-broadcast/pom.xml +++ b/basic/tcp-broadcast/pom.xml @@ -150,7 +150,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/basic/tcp-broadcast/src/main/java/org/springframework/integration/samples/tcpbroadcast/TcpBroadcastApplication.java b/basic/tcp-broadcast/src/main/java/org/springframework/integration/samples/tcpbroadcast/TcpBroadcastApplication.java index 3e18c70f..1d21bab2 100644 --- a/basic/tcp-broadcast/src/main/java/org/springframework/integration/samples/tcpbroadcast/TcpBroadcastApplication.java +++ b/basic/tcp-broadcast/src/main/java/org/springframework/integration/samples/tcpbroadcast/TcpBroadcastApplication.java @@ -36,7 +36,6 @@ import org.springframework.context.annotation.DependsOn; import org.springframework.context.event.EventListener; import org.springframework.core.task.TaskExecutor; import org.springframework.integration.dsl.IntegrationFlow; -import org.springframework.integration.dsl.IntegrationFlows; import org.springframework.integration.ip.IpHeaders; import org.springframework.integration.ip.dsl.Tcp; import org.springframework.integration.ip.tcp.connection.AbstractServerConnectionFactory; @@ -73,7 +72,7 @@ public class TcpBroadcastApplication { */ @Bean public IntegrationFlow tcpServer(AbstractServerConnectionFactory serverFactory) { - return IntegrationFlows.from(Tcp.inboundAdapter(serverFactory)) + return IntegrationFlow.from(Tcp.inboundAdapter(serverFactory)) .transform(p -> "connected!") .channel("toTcp.input") .get(); @@ -84,9 +83,9 @@ public class TcpBroadcastApplication { */ @Bean public IntegrationFlow gateway() { - return IntegrationFlows.from(Sender.class) - .channel("toTcp.input") - .get(); + return IntegrationFlow.from(Sender.class) + .channel("toTcp.input") + .get(); } /* @@ -155,6 +154,7 @@ public class TcpBroadcastApplication { public void shutDown() { this.applicationContext.close(); } + } @Component @@ -188,7 +188,7 @@ public class TcpBroadcastApplication { socket = SocketFactory.getDefault().createSocket("localhost", PORT); socket.getOutputStream().write("hello\r\n".getBytes()); InputStream is = socket.getInputStream(); - while(true) { + while (true) { System.out.println(new String(deserializer.deserialize(is)) + " from client# " + instance); } } diff --git a/basic/tcp-client-server/pom.xml b/basic/tcp-client-server/pom.xml index 470f89cc..421ed386 100644 --- a/basic/tcp-client-server/pom.xml +++ b/basic/tcp-client-server/pom.xml @@ -144,7 +144,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/basic/tcp-with-headers/pom.xml b/basic/tcp-with-headers/pom.xml index 7da422bf..2b83cd44 100644 --- a/basic/tcp-with-headers/pom.xml +++ b/basic/tcp-with-headers/pom.xml @@ -150,7 +150,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/basic/tcp-with-headers/src/main/java/org/springframework/integration/samples/tcpheaders/TcpWithHeadersApplication.java b/basic/tcp-with-headers/src/main/java/org/springframework/integration/samples/tcpheaders/TcpWithHeadersApplication.java index 7f79ab49..6962c1ca 100644 --- a/basic/tcp-with-headers/src/main/java/org/springframework/integration/samples/tcpheaders/TcpWithHeadersApplication.java +++ b/basic/tcp-with-headers/src/main/java/org/springframework/integration/samples/tcpheaders/TcpWithHeadersApplication.java @@ -26,7 +26,6 @@ import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.DependsOn; import org.springframework.integration.dsl.IntegrationFlow; -import org.springframework.integration.dsl.IntegrationFlows; import org.springframework.integration.handler.LoggingHandler.Level; import org.springframework.integration.ip.dsl.Tcp; import org.springframework.integration.ip.tcp.connection.MessageConvertingTcpMessageMapper; @@ -46,13 +45,13 @@ public class TcpWithHeadersApplication { public interface TcpExchanger { - public String exchange(String data, @Header("type") String type); + String exchange(String data, @Header("type") String type); } @Bean public IntegrationFlow client(@Value("${tcp.port:1234}") int port) { - return IntegrationFlows.from(TcpExchanger.class) + return IntegrationFlow.from(TcpExchanger.class) .handle(Tcp.outboundGateway(Tcp.netClient("localhost", port) .deserializer(jsonMapping()) .serializer(jsonMapping()) @@ -64,16 +63,16 @@ public class TcpWithHeadersApplication { @Bean public IntegrationFlow server(@Value("${tcp.port:1234}") int port) { - return IntegrationFlows.from(Tcp.inboundGateway(Tcp.netServer(port) + return IntegrationFlow.from(Tcp.inboundGateway(Tcp.netServer(port) .deserializer(jsonMapping()) .serializer(jsonMapping()) .mapper(mapper()))) .log(Level.INFO, "exampleLogger", "'Received type header:' + headers['type']") .route("headers['type']", r -> r .subFlowMapping("upper", - subFlow -> subFlow.transform(String.class, p -> p.toUpperCase())) + subFlow -> subFlow.transform(String.class, String::toUpperCase)) .subFlowMapping("lower", - subFlow -> subFlow.transform(String.class, p -> p.toLowerCase()))) + subFlow -> subFlow.transform(String.class, String::toLowerCase))) .get(); } @@ -99,14 +98,15 @@ public class TcpWithHeadersApplication { ConfigurableApplicationContext context) { return args -> { - System.out.println("Enter some text; if it starts with a lower case character,\n" - + "it will be uppercased by the server; otherwise it will be lowercased;\n" - + "enter 'quit' to end"); + System.out.println(""" + Enter some text; if it starts with a lower case character, + it will be upper-cased by the server; otherwise it will be lower-cased; + enter 'quit' to end"""); Scanner scanner = new Scanner(System.in); String request; if (scanner.hasNextLine()) { request = scanner.nextLine(); - while (!"quit".equals(request.toLowerCase())) { + while (!"quit".equalsIgnoreCase(request)) { if (StringUtils.hasText(request)) { String result = exchanger.exchange(request, Character.isLowerCase(request.charAt(0)) ? "upper" : "lower"); diff --git a/basic/testing-examples/pom.xml b/basic/testing-examples/pom.xml index 85de7860..6fdea688 100644 --- a/basic/testing-examples/pom.xml +++ b/basic/testing-examples/pom.xml @@ -148,7 +148,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/basic/twitter/pom.xml b/basic/twitter/pom.xml index 60d47bae..eaae2e45 100644 --- a/basic/twitter/pom.xml +++ b/basic/twitter/pom.xml @@ -134,7 +134,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/basic/web-sockets/pom.xml b/basic/web-sockets/pom.xml index 7e62a2c7..05feb8d0 100644 --- a/basic/web-sockets/pom.xml +++ b/basic/web-sockets/pom.xml @@ -145,7 +145,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/basic/ws-inbound-gateway/pom.xml b/basic/ws-inbound-gateway/pom.xml index 2b7e5c35..cbc4af1d 100644 --- a/basic/ws-inbound-gateway/pom.xml +++ b/basic/ws-inbound-gateway/pom.xml @@ -175,7 +175,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/basic/ws-outbound-gateway/pom.xml b/basic/ws-outbound-gateway/pom.xml index ef56d03f..07829fd5 100644 --- a/basic/ws-outbound-gateway/pom.xml +++ b/basic/ws-outbound-gateway/pom.xml @@ -138,7 +138,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/basic/xml/pom.xml b/basic/xml/pom.xml index 002d906c..1cda1f80 100644 --- a/basic/xml/pom.xml +++ b/basic/xml/pom.xml @@ -133,7 +133,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/basic/xmpp/pom.xml b/basic/xmpp/pom.xml index 4a421b0d..668624db 100644 --- a/basic/xmpp/pom.xml +++ b/basic/xmpp/pom.xml @@ -133,7 +133,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/build.gradle b/build.gradle index 215d9516..9a9e13a1 100644 --- a/build.gradle +++ b/build.gradle @@ -260,7 +260,7 @@ subprojects { subproject -> postgresVersion = '42.3.3' slf4jVersion = '1.7.30' springCloudVersion = '2022.0.0-SNAPSHOT' - springIntegrationVersion = '6.0.0-SNAPSHOT' + springIntegrationVersion = '6.0.0-M4' springIntegrationSocialTwiterVersion = '1.0.1.BUILD-SNAPSHOT' springIntegrationSplunkVersion = '1.2.0.BUILD-SNAPSHOT' springVersion = '6.0.0-SNAPSHOT' diff --git a/dsl/cafe-dsl/pom.xml b/dsl/cafe-dsl/pom.xml index ad7cbef9..2c62e20d 100644 --- a/dsl/cafe-dsl/pom.xml +++ b/dsl/cafe-dsl/pom.xml @@ -156,7 +156,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/dsl/kafka-dsl/pom.xml b/dsl/kafka-dsl/pom.xml index e6f003f4..e5055527 100644 --- a/dsl/kafka-dsl/pom.xml +++ b/dsl/kafka-dsl/pom.xml @@ -156,7 +156,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/dsl/kafka-dsl/src/main/java/org/springframework/integration/samples/dsl/kafka/Application.java b/dsl/kafka-dsl/src/main/java/org/springframework/integration/samples/dsl/kafka/Application.java index f8329687..65fab86a 100644 --- a/dsl/kafka-dsl/src/main/java/org/springframework/integration/samples/dsl/kafka/Application.java +++ b/dsl/kafka-dsl/src/main/java/org/springframework/integration/samples/dsl/kafka/Application.java @@ -32,7 +32,6 @@ import org.springframework.context.annotation.Bean; import org.springframework.integration.annotation.Gateway; import org.springframework.integration.annotation.MessagingGateway; import org.springframework.integration.dsl.IntegrationFlow; -import org.springframework.integration.dsl.IntegrationFlows; import org.springframework.integration.dsl.context.IntegrationFlowContext; import org.springframework.integration.kafka.dsl.Kafka; import org.springframework.kafka.core.ConsumerFactory; @@ -54,8 +53,8 @@ public class Application { public static void main(String[] args) throws Exception { ConfigurableApplicationContext context = new SpringApplicationBuilder(Application.class) - .web(WebApplicationType.NONE) - .run(args); + .web(WebApplicationType.NONE) + .run(args); context.getBean(Application.class).runDemo(context); context.close(); } @@ -110,7 +109,7 @@ public class Application { @Bean public IntegrationFlow fromKafkaFlow(ConsumerFactory consumerFactory) { - return IntegrationFlows + return IntegrationFlow .from(Kafka.messageDrivenChannelAdapter(consumerFactory, this.properties.getTopic())) .channel(c -> c.queue("fromKafka")) .get(); @@ -142,11 +141,11 @@ public class Application { consumerProperties.put(ConsumerConfig.GROUP_ID_CONFIG, consumerProperties.get(ConsumerConfig.GROUP_ID_CONFIG) + "x"); IntegrationFlow flow = - IntegrationFlows - .from(Kafka.messageDrivenChannelAdapter( - new DefaultKafkaConsumerFactory(consumerProperties), topics)) - .channel("fromKafka") - .get(); + IntegrationFlow + .from(Kafka.messageDrivenChannelAdapter( + new DefaultKafkaConsumerFactory(consumerProperties), topics)) + .channel("fromKafka") + .get(); this.flowContext.registration(flow).register(); } diff --git a/dsl/si4demo/pom.xml b/dsl/si4demo/pom.xml index 063adda0..535d75ef 100644 --- a/dsl/si4demo/pom.xml +++ b/dsl/si4demo/pom.xml @@ -178,7 +178,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/dsl/Application.java b/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/dsl/Application.java index 0eea40b4..b82d5c85 100644 --- a/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/dsl/Application.java +++ b/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/dsl/Application.java @@ -32,7 +32,6 @@ import org.springframework.integration.annotation.IntegrationComponentScan; import org.springframework.integration.annotation.MessagingGateway; import org.springframework.integration.channel.DirectChannel; import org.springframework.integration.dsl.IntegrationFlow; -import org.springframework.integration.dsl.IntegrationFlows; import org.springframework.integration.http.inbound.HttpRequestHandlingMessagingGateway; import org.springframework.integration.http.inbound.RequestMapping; import org.springframework.integration.ip.tcp.TcpInboundGateway; @@ -129,7 +128,7 @@ public class Application { @Bean @DependsOn("errorFlow") public IntegrationFlow flow() { - return IntegrationFlows.from("requestChannel") + return IntegrationFlow.from("requestChannel") .transform(new ObjectToStringTransformer()) .filter((String p) -> p.startsWith("#spring"), f -> f.discardChannel("rejected")) @@ -141,15 +140,14 @@ public class Application { @Bean public IntegrationFlow errorFlow() { - return IntegrationFlows.from("rejected") + return IntegrationFlow.from("rejected") .transform("'Error: hashtag must start with #spring; got' + payload") .get(); } @Bean public TwitterSearchOutboundGateway twitterGate() { - TwitterSearchOutboundGateway gateway = new TwitterSearchOutboundGateway(twitter()); - return gateway; + return new TwitterSearchOutboundGateway(twitter()); } @Bean diff --git a/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/e/EDSL.java b/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/e/EDSL.java index d8f1de0b..c55851f6 100644 --- a/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/e/EDSL.java +++ b/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/e/EDSL.java @@ -26,7 +26,6 @@ import org.springframework.integration.annotation.IntegrationComponentScan; import org.springframework.integration.annotation.MessagingGateway; import org.springframework.integration.channel.DirectChannel; import org.springframework.integration.dsl.IntegrationFlow; -import org.springframework.integration.dsl.IntegrationFlows; import org.springframework.messaging.MessageChannel; /** @@ -42,13 +41,13 @@ public class EDSL { public static void main(String[] args) throws Exception { ConfigurableApplicationContext ctx = new SpringApplicationBuilder(EDSL.class) - .web(WebApplicationType.NONE) - .run(args); + .web(WebApplicationType.NONE) + .run(args); System.out.println(ctx.getBean(FooService.class).foo("foo")); ctx.close(); } - @MessagingGateway(defaultRequestChannel="foo") + @MessagingGateway(defaultRequestChannel = "foo") public static interface FooService { String foo(String request); @@ -62,10 +61,10 @@ public class EDSL { @Bean IntegrationFlow flow() { - return IntegrationFlows.from(foo()) - .transform("payload + payload") - .handle(String.class, (p, h) -> p.toUpperCase()) - .get(); + return IntegrationFlow.from(foo()) + .transform("payload + payload") + .handle(String.class, (p, h) -> p.toUpperCase()) + .get(); } } diff --git a/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/f/FMail.java b/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/f/FMail.java index 2dac4158..9aba04cc 100644 --- a/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/f/FMail.java +++ b/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/f/FMail.java @@ -29,7 +29,6 @@ import org.springframework.integration.annotation.IntegrationComponentScan; import org.springframework.integration.annotation.MessagingGateway; import org.springframework.integration.channel.DirectChannel; import org.springframework.integration.dsl.IntegrationFlow; -import org.springframework.integration.dsl.IntegrationFlows; import org.springframework.integration.mail.dsl.Mail; import org.springframework.integration.samples.si4demo.springone.GMailProperties; import org.springframework.messaging.MessageChannel; @@ -57,7 +56,7 @@ public class FMail { ctx.close(); } - @MessagingGateway(defaultRequestChannel="foo.input") + @MessagingGateway(defaultRequestChannel = "foo.input") public static interface FooService { String foo(String request); @@ -67,11 +66,11 @@ public class FMail { @Bean IntegrationFlow foo() { return f -> f - .transform("payload + payload") - .handle(String.class, (p, h) -> p.toUpperCase()) - .routeToRecipients(r -> - r.recipient("bridgeToNowhere", "true") - .recipient("smtpChannel", "true")); + .transform("payload + payload") + .handle(String.class, (p, h) -> p.toUpperCase()) + .routeToRecipients(r -> + r.recipient("bridgeToNowhere", "true") + .recipient("smtpChannel", "true")); } @BridgeTo @@ -87,17 +86,17 @@ public class FMail { @Bean IntegrationFlow smtp() { - return IntegrationFlows.from(smtpChannel()) + return IntegrationFlow.from(smtpChannel()) .enrichHeaders(Mail.headers() .subject("SpringOne 2014") .to("sispringone@gmail.com") .from("sispringone@gmail.com")) .handle(Mail.outboundAdapter("smtp.gmail.com") - .port(465) - .protocol("smtps") - .credentials(gmail.getUser(), gmail.getPassword()) - .javaMailProperties(p -> - p.put("mail.debug", "false")) + .port(465) + .protocol("smtps") + .credentials(gmail.getUser(), gmail.getPassword()) + .javaMailProperties(p -> + p.put("mail.debug", "false")) , e -> e.id("smtpOut")) .get(); } diff --git a/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/g/GIMAP.java b/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/g/GIMAP.java index b3b225dc..0c6131b2 100644 --- a/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/g/GIMAP.java +++ b/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/springone/g/GIMAP.java @@ -25,7 +25,6 @@ import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.integration.dsl.IntegrationFlow; -import org.springframework.integration.dsl.IntegrationFlows; import org.springframework.integration.mail.MailHeaders; import org.springframework.integration.mail.dsl.Mail; import org.springframework.integration.samples.si4demo.springone.GMailProperties; @@ -56,16 +55,16 @@ public class GIMAP { @Bean IntegrationFlow imapIdle() { - return IntegrationFlows.from(Mail.imapIdleAdapter( - "imaps://" - + gmail.getUser().replaceAll("@", "%40") - + ":" - + gmail.getPassword() - + "@imap.gmail.com:993/INBOX") + return IntegrationFlow.from(Mail.imapIdleAdapter( + "imaps://" + + gmail.getUser().replaceAll("@", "%40") + + ":" + + gmail.getPassword() + + "@imap.gmail.com:993/INBOX") .id("imapIn") .autoStartup(true) .javaMailProperties(p -> - p.put("mail.debug", "false"))) + p.put("mail.debug", "false"))) .enrichHeaders(s -> s.headerExpressions(h -> h .put(MailHeaders.SUBJECT, "payload.subject") .put(MailHeaders.FROM, "payload.from[0].toString()"))) diff --git a/intermediate/async-gateway/pom.xml b/intermediate/async-gateway/pom.xml index 6cb6d955..f75b4fbe 100644 --- a/intermediate/async-gateway/pom.xml +++ b/intermediate/async-gateway/pom.xml @@ -133,7 +133,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/intermediate/dynamic-poller/pom.xml b/intermediate/dynamic-poller/pom.xml index c3a0bfc5..fc3a3198 100644 --- a/intermediate/dynamic-poller/pom.xml +++ b/intermediate/dynamic-poller/pom.xml @@ -133,7 +133,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/intermediate/errorhandling/pom.xml b/intermediate/errorhandling/pom.xml index 1237f4e0..4e21eb7c 100644 --- a/intermediate/errorhandling/pom.xml +++ b/intermediate/errorhandling/pom.xml @@ -133,7 +133,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/intermediate/file-processing/pom.xml b/intermediate/file-processing/pom.xml index 374817bf..6c25cb3c 100644 --- a/intermediate/file-processing/pom.xml +++ b/intermediate/file-processing/pom.xml @@ -133,7 +133,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/intermediate/mail-attachments/pom.xml b/intermediate/mail-attachments/pom.xml index 85ad4eee..72326371 100644 --- a/intermediate/mail-attachments/pom.xml +++ b/intermediate/mail-attachments/pom.xml @@ -150,7 +150,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/intermediate/monitoring/pom.xml b/intermediate/monitoring/pom.xml index 1d078817..e44680f0 100644 --- a/intermediate/monitoring/pom.xml +++ b/intermediate/monitoring/pom.xml @@ -187,7 +187,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/intermediate/multipart-http/pom.xml b/intermediate/multipart-http/pom.xml index fab93cd0..fd064e8a 100644 --- a/intermediate/multipart-http/pom.xml +++ b/intermediate/multipart-http/pom.xml @@ -187,7 +187,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/intermediate/rest-http/pom.xml b/intermediate/rest-http/pom.xml index 0a53a801..67c6ac06 100644 --- a/intermediate/rest-http/pom.xml +++ b/intermediate/rest-http/pom.xml @@ -218,7 +218,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/intermediate/retry-and-more/pom.xml b/intermediate/retry-and-more/pom.xml index fa006d14..929dae2a 100644 --- a/intermediate/retry-and-more/pom.xml +++ b/intermediate/retry-and-more/pom.xml @@ -166,7 +166,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/intermediate/splitter-aggregator-reaper/pom.xml b/intermediate/splitter-aggregator-reaper/pom.xml index 3b2750fd..f6ffb779 100644 --- a/intermediate/splitter-aggregator-reaper/pom.xml +++ b/intermediate/splitter-aggregator-reaper/pom.xml @@ -133,7 +133,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/intermediate/stored-procedures-derby/pom.xml b/intermediate/stored-procedures-derby/pom.xml index 8ae1d120..318f7c2d 100644 --- a/intermediate/stored-procedures-derby/pom.xml +++ b/intermediate/stored-procedures-derby/pom.xml @@ -139,7 +139,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/intermediate/stored-procedures-ms/pom.xml b/intermediate/stored-procedures-ms/pom.xml index 48365ef6..cb2b636f 100644 --- a/intermediate/stored-procedures-ms/pom.xml +++ b/intermediate/stored-procedures-ms/pom.xml @@ -145,7 +145,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/intermediate/stored-procedures-oracle/pom.xml b/intermediate/stored-procedures-oracle/pom.xml index 02f635d4..f5672588 100644 --- a/intermediate/stored-procedures-oracle/pom.xml +++ b/intermediate/stored-procedures-oracle/pom.xml @@ -139,7 +139,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/intermediate/stored-procedures-postgresql/pom.xml b/intermediate/stored-procedures-postgresql/pom.xml index 34cbd4b3..47728617 100644 --- a/intermediate/stored-procedures-postgresql/pom.xml +++ b/intermediate/stored-procedures-postgresql/pom.xml @@ -151,7 +151,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/intermediate/tcp-async-bi-directional/pom.xml b/intermediate/tcp-async-bi-directional/pom.xml index 0a36696d..b7cf0b94 100644 --- a/intermediate/tcp-async-bi-directional/pom.xml +++ b/intermediate/tcp-async-bi-directional/pom.xml @@ -145,7 +145,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/intermediate/tcp-async-bi-directional/src/main/java/org/springframework/integration/samples/tcpasyncbi/TcpAsyncBiDirectionalApplication.java b/intermediate/tcp-async-bi-directional/src/main/java/org/springframework/integration/samples/tcpasyncbi/TcpAsyncBiDirectionalApplication.java index 4674a7f1..41ab7fb3 100644 --- a/intermediate/tcp-async-bi-directional/src/main/java/org/springframework/integration/samples/tcpasyncbi/TcpAsyncBiDirectionalApplication.java +++ b/intermediate/tcp-async-bi-directional/src/main/java/org/springframework/integration/samples/tcpasyncbi/TcpAsyncBiDirectionalApplication.java @@ -26,7 +26,6 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.event.EventListener; import org.springframework.integration.dsl.IntegrationFlow; -import org.springframework.integration.dsl.IntegrationFlows; import org.springframework.integration.dsl.Pollers; import org.springframework.integration.dsl.Transformers; import org.springframework.integration.ip.IpHeaders; @@ -66,7 +65,7 @@ class ClientPeer { @Bean public IntegrationFlow client1Out(AbstractClientConnectionFactory client1) { - return IntegrationFlows.fromSupplier(() -> "Hello from client1", e -> e.id("client1Adapter") + return IntegrationFlow.fromSupplier(() -> "Hello from client1", e -> e.id("client1Adapter") .poller(Pollers.fixedDelay(3000))) .handle(Tcp.outboundAdapter(client1)) .get(); @@ -74,7 +73,7 @@ class ClientPeer { @Bean public IntegrationFlow client1In(AbstractClientConnectionFactory client1) { - return IntegrationFlows.from(Tcp.inboundAdapter(client1)) + return IntegrationFlow.from(Tcp.inboundAdapter(client1)) .transform(Transformers.objectToString()) .log(msg -> "client1: " + msg.getPayload()) .get(); @@ -87,7 +86,7 @@ class ClientPeer { @Bean public IntegrationFlow client2Out(AbstractClientConnectionFactory client2) { - return IntegrationFlows.fromSupplier(() -> "Hello from client2", e -> e.id("client2Adapter") + return IntegrationFlow.fromSupplier(() -> "Hello from client2", e -> e.id("client2Adapter") .poller(Pollers.fixedDelay(2000))) .handle(Tcp.outboundAdapter(client2)) .get(); @@ -95,7 +94,7 @@ class ClientPeer { @Bean public IntegrationFlow client2In(AbstractClientConnectionFactory client2) { - return IntegrationFlows.from(Tcp.inboundAdapter(client2)) + return IntegrationFlow.from(Tcp.inboundAdapter(client2)) .transform(Transformers.objectToString()) .log(msg -> "client2: " + msg.getPayload()) .get(); @@ -115,7 +114,7 @@ class ServerPeer { @Bean public IntegrationFlow serverIn(AbstractServerConnectionFactory server) { - return IntegrationFlows.from(Tcp.inboundAdapter(server)) + return IntegrationFlow.from(Tcp.inboundAdapter(server)) .transform(Transformers.objectToString()) .log(msg -> "server: " + msg.getPayload()) .get(); @@ -123,7 +122,7 @@ class ServerPeer { @Bean public IntegrationFlow serverOut(AbstractServerConnectionFactory server) { - return IntegrationFlows.fromSupplier(() -> "seed", e -> e.poller(Pollers.fixedDelay(5000))) + return IntegrationFlow.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") diff --git a/intermediate/tcp-client-server-multiplex/pom.xml b/intermediate/tcp-client-server-multiplex/pom.xml index 322bde3a..82a26275 100644 --- a/intermediate/tcp-client-server-multiplex/pom.xml +++ b/intermediate/tcp-client-server-multiplex/pom.xml @@ -133,7 +133,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/intermediate/testcontainers-rabbitmq/pom.xml b/intermediate/testcontainers-rabbitmq/pom.xml index 3555be72..7d941b49 100644 --- a/intermediate/testcontainers-rabbitmq/pom.xml +++ b/intermediate/testcontainers-rabbitmq/pom.xml @@ -179,7 +179,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/intermediate/travel/pom.xml b/intermediate/travel/pom.xml index b8a3c435..2e048756 100644 --- a/intermediate/travel/pom.xml +++ b/intermediate/travel/pom.xml @@ -143,7 +143,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom diff --git a/intermediate/tx-synch/pom.xml b/intermediate/tx-synch/pom.xml index 78f78880..fe9bc5e5 100644 --- a/intermediate/tx-synch/pom.xml +++ b/intermediate/tx-synch/pom.xml @@ -144,7 +144,7 @@ org.springframework.integration spring-integration-bom - 6.0.0-SNAPSHOT + 6.0.0-M4 import pom