-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Improve Java DSL for Rabbit Streams (#8598)
* Improve Java DSL for Rabbit Streams * Expose simple properties for `streamName` and `superStream` on the `RabbitStreamInboundChannelAdapterSpec` * Add `superStream(String superStream, String name, int consumers)` option * Add `outboundStreamAdapter(Environment environment, String streamName)` factory for simple use-cases * Add `RabbitStreamTests` integration test to cover Rabbit Streams support and demonstrate respective Java DSL * Mention the change in the docs * * Fix typos in code and docs
- Loading branch information
1 parent
fa178c3
commit feb4705
Showing
6 changed files
with
261 additions
and
31 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
166 changes: 166 additions & 0 deletions
166
...ration-amqp/src/test/java/org/springframework/integration/amqp/dsl/RabbitStreamTests.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,166 @@ | ||
| /* | ||
| * Copyright 2014-2023 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. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * https://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.springframework.integration.amqp.dsl; | ||
|
|
||
| import com.rabbitmq.stream.Address; | ||
| import com.rabbitmq.stream.Environment; | ||
| import org.junit.jupiter.api.Test; | ||
|
|
||
| import org.springframework.amqp.core.Queue; | ||
| import org.springframework.amqp.core.QueueBuilder; | ||
| import org.springframework.amqp.rabbit.connection.CachingConnectionFactory; | ||
| import org.springframework.amqp.rabbit.connection.ConnectionFactory; | ||
| import org.springframework.amqp.rabbit.core.RabbitAdmin; | ||
| import org.springframework.amqp.rabbit.core.RabbitTemplate; | ||
| import org.springframework.beans.factory.annotation.Autowired; | ||
| import org.springframework.context.annotation.Bean; | ||
| import org.springframework.context.annotation.Configuration; | ||
| import org.springframework.integration.amqp.support.RabbitTestContainer; | ||
| import org.springframework.integration.annotation.ServiceActivator; | ||
| import org.springframework.integration.channel.QueueChannel; | ||
| import org.springframework.integration.config.EnableIntegration; | ||
| import org.springframework.integration.dsl.IntegrationFlow; | ||
| import org.springframework.messaging.Message; | ||
| import org.springframework.messaging.MessageChannel; | ||
| import org.springframework.messaging.PollableChannel; | ||
| import org.springframework.messaging.support.GenericMessage; | ||
| import org.springframework.rabbit.stream.config.SuperStream; | ||
| import org.springframework.test.annotation.DirtiesContext; | ||
| import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; | ||
|
|
||
| import static org.assertj.core.api.Assertions.assertThat; | ||
|
|
||
| /** | ||
| * @author Artem Bilan | ||
| * | ||
| * @since 6.1 | ||
| */ | ||
| @SpringJUnitConfig | ||
| @DirtiesContext | ||
| public class RabbitStreamTests implements RabbitTestContainer { | ||
|
|
||
| @Autowired | ||
| MessageChannel sendToRabbitStreamChannel; | ||
|
|
||
| @Autowired | ||
| PollableChannel results; | ||
|
|
||
| @Test | ||
| void rabbitStreamWithSpringIntegrationChannelAdapters() { | ||
| var testData = "test data"; | ||
| this.sendToRabbitStreamChannel.send(new GenericMessage<>(testData)); | ||
|
|
||
| Message<?> receive = results.receive(10_000); | ||
|
|
||
| assertThat(receive).isNotNull() | ||
| .extracting(Message::getPayload) | ||
| .isEqualTo(testData); | ||
| } | ||
|
|
||
| @Autowired | ||
| MessageChannel sendToRabbitSuperStreamChannel; | ||
|
|
||
| @Test | ||
| void superStreamWithSpringIntegrationChannelAdapters() { | ||
| var testData = "test super data"; | ||
| this.sendToRabbitSuperStreamChannel.send(new GenericMessage<>(testData)); | ||
|
|
||
| Message<?> receive = results.receive(10_000); | ||
|
|
||
| assertThat(receive).isNotNull() | ||
| .extracting(Message::getPayload) | ||
| .isEqualTo(testData); | ||
| } | ||
|
|
||
| @Configuration | ||
| @EnableIntegration | ||
| public static class ContextConfiguration { | ||
|
|
||
| @Bean | ||
| ConnectionFactory rabbitConnectionFactory() { | ||
| return new CachingConnectionFactory(RabbitTestContainer.amqpPort()); | ||
| } | ||
|
|
||
| @Bean | ||
| RabbitTemplate rabbitTemplate(ConnectionFactory rabbitConnectionFactory) { | ||
| return new RabbitTemplate(rabbitConnectionFactory); | ||
| } | ||
|
|
||
| @Bean | ||
| Environment rabbitStreamEnvironment() { | ||
| return Environment.builder() | ||
| .addressResolver(add -> new Address("localhost", RabbitTestContainer.streamPort())) | ||
| .build(); | ||
| } | ||
|
|
||
| @Bean(initMethod = "initialize") | ||
| RabbitAdmin rabbitAdmin(ConnectionFactory rabbitConnectionFactory) { | ||
| return new RabbitAdmin(rabbitConnectionFactory); | ||
| } | ||
|
|
||
| @Bean | ||
| Queue stream() { | ||
| return QueueBuilder.durable("test.stream1") | ||
| .stream() | ||
| .build(); | ||
| } | ||
|
|
||
| @Bean | ||
| @ServiceActivator(inputChannel = "sendToRabbitStreamChannel") | ||
| RabbitStreamMessageHandlerSpec rabbitStreamMessageHandler(Environment env, Queue stream) { | ||
| return RabbitStream.outboundStreamAdapter(env, stream.getName()).sync(true); | ||
| } | ||
|
|
||
| @Bean | ||
| IntegrationFlow rabbitStreamConsumer(Environment env, Queue stream) { | ||
| return IntegrationFlow.from( | ||
| RabbitStream.inboundAdapter(env) | ||
| .streamName(stream.getName())) | ||
| .channel("results") | ||
| .get(); | ||
| } | ||
|
|
||
| @Bean | ||
| QueueChannel results() { | ||
| return new QueueChannel(); | ||
| } | ||
|
|
||
| @Bean | ||
| SuperStream superStream() { | ||
| return new SuperStream("test.superStream1", 3); | ||
| } | ||
|
|
||
| @Bean | ||
| @ServiceActivator(inputChannel = "sendToRabbitSuperStreamChannel") | ||
| AmqpOutboundChannelAdapterSpec rabbitSuperStreamMessageHandler(RabbitTemplate rabbitTemplate) { | ||
| return Amqp.outboundAdapter(rabbitTemplate) | ||
| .exchangeName("test.superStream1") | ||
| .routingKey("1"); | ||
| } | ||
|
|
||
| @Bean | ||
| IntegrationFlow superStreamConsumer(Environment env) { | ||
| return IntegrationFlow.from( | ||
| RabbitStream.inboundAdapter(env) | ||
| .superStream("test.superStream1", "mySuperConsumer")) | ||
| .channel("results") | ||
| .get(); | ||
| } | ||
|
|
||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters