-
Notifications
You must be signed in to change notification settings - Fork 627
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
GH-2439: Fix Bindings with Broker Gen Queue Names
Resolves #2439 To configure a broker-named queue, the `Queue` name is set to an empty String; the name is later populated when the queue is declared. However, if such a queue is used in a `BindingBuilder`, the builder accesses the name before it is populated. When such a queue is used in a binding, retain a copy of the queue object and retrieve its actual name when the binding is declared. Add a unit test for all binding types; also tested with the following, with both queues being bound properly to the exchange. ```java @bean Queue q1() { return QueueBuilder.nonDurable("").build(); } @bean Queue q2() { return QueueBuilder.nonDurable("").build(); } @bean Binding b1(Queue q1, DirectExchange ex) { return BindingBuilder.bind(q1).to(ex).with("foo"); } @bean Binding b2(Queue q2, DirectExchange ex) { return BindingBuilder.bind(q2).to(ex).with("bar"); } @bean DirectExchange ex() { return new DirectExchange("ex"); } ``` **cherry-pick to 2.4.x**
- Loading branch information
1 parent
61f535b
commit 6ed749e
Showing
3 changed files
with
192 additions
and
18 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
129 changes: 129 additions & 0 deletions
129
...mqp/src/test/java/org/springframework/amqp/core/BindingBuilderWithLazyQueueNameTests.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,129 @@ | ||
| /* | ||
| * Copyright 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.amqp.core; | ||
|
|
||
| import static org.assertj.core.api.Assertions.assertThat; | ||
|
|
||
| import java.util.Collections; | ||
|
|
||
| import org.junit.jupiter.api.BeforeAll; | ||
| import org.junit.jupiter.api.Test; | ||
|
|
||
| /** | ||
| * Copy of {@link BindingBuilderTests} but using a queue with a lazy name. | ||
| * | ||
| * @author Mark Fisher | ||
| * @author Artem Yakshin | ||
| * @author Gary Russell | ||
| */ | ||
| public class BindingBuilderWithLazyQueueNameTests { | ||
|
|
||
| private static Queue queue; | ||
|
|
||
| @BeforeAll | ||
| public static void setUp() { | ||
| queue = new Queue(""); | ||
| queue.setActualName("actual"); | ||
| } | ||
|
|
||
| @Test | ||
| public void fanoutBinding() { | ||
| FanoutExchange fanoutExchange = new FanoutExchange("f"); | ||
| Binding binding = BindingBuilder.bind(queue).to(fanoutExchange); | ||
| assertThat(binding).isNotNull(); | ||
| assertThat(binding.getExchange()).isEqualTo(fanoutExchange.getName()); | ||
| assertThat(binding.getRoutingKey()).isEqualTo(""); | ||
| assertThat(binding.getDestinationType()).isEqualTo(Binding.DestinationType.QUEUE); | ||
| assertThat(binding.getDestination()).isEqualTo(queue.getActualName()); | ||
| } | ||
|
|
||
| @Test | ||
| public void directBinding() { | ||
| DirectExchange directExchange = new DirectExchange("d"); | ||
| String routingKey = "r"; | ||
| Binding binding = BindingBuilder.bind(queue).to(directExchange).with(routingKey); | ||
| assertThat(binding).isNotNull(); | ||
| assertThat(binding.getExchange()).isEqualTo(directExchange.getName()); | ||
| assertThat(binding.getDestinationType()).isEqualTo(Binding.DestinationType.QUEUE); | ||
| assertThat(binding.getDestination()).isEqualTo(queue.getActualName()); | ||
| assertThat(binding.getRoutingKey()).isEqualTo(routingKey); | ||
| } | ||
|
|
||
| @Test | ||
| public void directBindingWithQueueName() { | ||
| DirectExchange directExchange = new DirectExchange("d"); | ||
| Binding binding = BindingBuilder.bind(queue).to(directExchange).withQueueName(); | ||
| assertThat(binding).isNotNull(); | ||
| assertThat(binding.getExchange()).isEqualTo(directExchange.getName()); | ||
| assertThat(binding.getDestinationType()).isEqualTo(Binding.DestinationType.QUEUE); | ||
| assertThat(binding.getDestination()).isEqualTo(queue.getActualName()); | ||
| assertThat(binding.getRoutingKey()).isEqualTo(queue.getActualName()); | ||
| } | ||
|
|
||
| @Test | ||
| public void topicBinding() { | ||
| TopicExchange topicExchange = new TopicExchange("t"); | ||
| String routingKey = "r"; | ||
| Binding binding = BindingBuilder.bind(queue).to(topicExchange).with(routingKey); | ||
| assertThat(binding).isNotNull(); | ||
| assertThat(binding.getExchange()).isEqualTo(topicExchange.getName()); | ||
| assertThat(binding.getDestinationType()).isEqualTo(Binding.DestinationType.QUEUE); | ||
| assertThat(binding.getDestination()).isEqualTo(queue.getActualName()); | ||
| assertThat(binding.getRoutingKey()).isEqualTo(routingKey); | ||
| } | ||
|
|
||
| @Test | ||
| public void headerBinding() { | ||
| HeadersExchange headersExchange = new HeadersExchange("h"); | ||
| String headerKey = "headerKey"; | ||
| Binding binding = BindingBuilder.bind(queue).to(headersExchange).where(headerKey).exists(); | ||
| assertThat(binding).isNotNull(); | ||
| assertThat(binding.getExchange()).isEqualTo(headersExchange.getName()); | ||
| assertThat(binding.getDestinationType()).isEqualTo(Binding.DestinationType.QUEUE); | ||
| assertThat(binding.getDestination()).isEqualTo(queue.getActualName()); | ||
| assertThat(binding.getRoutingKey()).isEqualTo(""); | ||
| } | ||
|
|
||
| @Test | ||
| public void customBinding() { | ||
| class CustomExchange extends AbstractExchange { | ||
| CustomExchange(String name) { | ||
| super(name); | ||
| } | ||
|
|
||
| @Override | ||
| public String getType() { | ||
| return "x-custom"; | ||
| } | ||
| } | ||
| Object argumentObject = new Object(); | ||
| CustomExchange customExchange = new CustomExchange("c"); | ||
| String routingKey = "r"; | ||
| Binding binding = BindingBuilder.// | ||
| bind(queue).// | ||
| to(customExchange).// | ||
| with(routingKey).// | ||
| and(Collections.<String, Object>singletonMap("k", argumentObject)); | ||
| assertThat(binding).isNotNull(); | ||
| assertThat(binding.getArguments().get("k")).isEqualTo(argumentObject); | ||
| assertThat(binding.getExchange()).isEqualTo(customExchange.getName()); | ||
| assertThat(binding.getDestinationType()).isEqualTo(Binding.DestinationType.QUEUE); | ||
| assertThat(binding.getDestination()).isEqualTo(queue.getActualName()); | ||
| assertThat(binding.getRoutingKey()).isEqualTo(routingKey); | ||
| } | ||
|
|
||
| } |