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

Polish "Support IPv6 addresses when configuring RabbitMQ using properties"

Browse Source 
See gh-37619
This commit is contained in:
Scott Frederick
2023-09-28 16:07:25 -05:00
parent c1972f6db6
commit fad43adf14
3 changed files with 31 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/PropertiesRabbitConnectionDetails.java
View File

@@ -53,9 +53,9 @@ class PropertiesRabbitConnectionDetails implements RabbitConnectionDetails {
public List<Address> getAddresses() {
List<Address> addresses = new ArrayList<>();
for (String address : this.properties.determineAddresses().split(",")) {
int portSeparatorPosition = address.lastIndexOf(':');
String host = address.substring(0, portSeparatorPosition);
String port = address.substring(portSeparatorPosition + 1);
int portSeparatorIndex = address.lastIndexOf(':');
String host = address.substring(0, portSeparatorIndex);
String port = address.substring(portSeparatorIndex + 1);
addresses.add(new Address(host, Integer.parseInt(port)));
}
return addresses;

30
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/amqp/PropertiesRabbitConnectionDetailsTest.java → spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/amqp/PropertiesRabbitConnectionDetailsTests.java
View File

@@ -23,20 +23,32 @@ import org.junit.jupiter.api.Test;
import org.springframework.boot.autoconfigure.amqp.RabbitConnectionDetails.Address;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.*;
class PropertiesRabbitConnectionDetailsTest {
/**
* Tests for {@link PropertiesRabbitConnectionDetails}.
*
* @author Jonas Fügedi
*/
class PropertiesRabbitConnectionDetailsTests {
private static final int DEFAULT_PORT = 5672;
@Test
void getAddresses() {
RabbitProperties properties = new RabbitProperties();
properties.setAddresses("localhost:1234,[::1]:32863");
PropertiesRabbitConnectionDetails propertiesRabbitConnectionDetails = new PropertiesRabbitConnectionDetails(properties);
properties.setAddresses("localhost,localhost:1234,[::1],[::1]:32863");
PropertiesRabbitConnectionDetails propertiesRabbitConnectionDetails = new PropertiesRabbitConnectionDetails(
properties);
List<Address> addresses = propertiesRabbitConnectionDetails.getAddresses();
assertThat(addresses.size()).isEqualTo(2);
assertThat(addresses.size()).isEqualTo(4);
assertThat(addresses.get(0).host()).isEqualTo("localhost");
assertThat(addresses.get(1).host()).isEqualTo("[::1]");
assertThat(addresses.get(0).port()).isEqualTo(1234);
assertThat(addresses.get(1).port()).isEqualTo(32863);
assertThat(addresses.get(0).port()).isEqualTo(DEFAULT_PORT);
assertThat(addresses.get(1).host()).isEqualTo("localhost");
assertThat(addresses.get(1).port()).isEqualTo(1234);
assertThat(addresses.get(2).host()).isEqualTo("[::1]");
assertThat(addresses.get(2).port()).isEqualTo(DEFAULT_PORT);
assertThat(addresses.get(3).host()).isEqualTo("[::1]");
assertThat(addresses.get(3).port()).isEqualTo(32863);
}
}
}

14
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/amqp/RabbitPropertiesTests.java
View File

@@ -274,13 +274,6 @@ class RabbitPropertiesTests {
assertThat(this.properties.determineAddresses()).isEqualTo("localhost:5671");
}
@Test
void determineAddressesUsesHostAndPortPropertiesWhenNoAddressesSetIpV6() {
this.properties.setHost("[::1]");
this.properties.setPort(32863);
assertThat(this.properties.determineAddresses()).isEqualTo("[::1]:32863");
}
@Test
void determineAddressesUsesHostAndPortPropertiesWhenNoAddressesSet() {
this.properties.setHost("rabbit.example.com");
@@ -288,6 +281,13 @@ class RabbitPropertiesTests {
assertThat(this.properties.determineAddresses()).isEqualTo("rabbit.example.com:1234");
}
@Test
void determineAddressesUsesIpv6HostAndPortPropertiesWhenNoAddressesSet() {
this.properties.setHost("[::1]");
this.properties.setPort(32863);
assertThat(this.properties.determineAddresses()).isEqualTo("[::1]:32863");
}
@Test
void determineSslUsingAmqpsReturnsStateOfFirstAddress() {
this.properties.setAddresses("amqps://root:password@otherhost,amqp://root:password2@otherhost2");