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

Polish "Prevent warnings when running embedded Artemis"

Browse Source 
Closes gh-12680
This commit is contained in:
Phillip Webb
2018-04-04 21:10:35 -07:00
parent 19818b752c
commit 41dc70146a
2 changed files with 24 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisEmbeddedConfigurationFactory.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2017 the original author or authors.
* Copyright 2012-2018 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.
@@ -70,29 +70,22 @@ class ArtemisEmbeddedConfigurationFactory {
+ this.properties.getClusterPassword());
}
configuration.setClusterPassword(this.properties.getClusterPassword());
configuration.addAddressConfiguration(createAddressConfiguration("DLQ"));
configuration.addAddressConfiguration(createAddressConfiguration("ExpiryQueue"));
configuration.addAddressesSetting("#",
new AddressSettings()
.setDeadLetterAddress(SimpleString.toSimpleString("DLQ"))
.setExpiryAddress(SimpleString.toSimpleString("ExpiryQueue")));
configuration.addAddressConfiguration(
new CoreAddressConfiguration()
.setName("DLQ")
.addRoutingType(RoutingType.ANYCAST)
.addQueueConfiguration(
new CoreQueueConfiguration()
.setName("DLQ")
.setRoutingType(RoutingType.ANYCAST)));
configuration.addAddressConfiguration(
new CoreAddressConfiguration()
.setName("ExpiryQueue")
.addRoutingType(RoutingType.ANYCAST)
.addQueueConfiguration(
new CoreQueueConfiguration()
.setName("ExpiryQueue")
.setRoutingType(RoutingType.ANYCAST)));
new AddressSettings()
.setDeadLetterAddress(SimpleString.toSimpleString("DLQ"))
.setExpiryAddress(SimpleString.toSimpleString("ExpiryQueue")));
return configuration;
}
private CoreAddressConfiguration createAddressConfiguration(String name) {
return new CoreAddressConfiguration().setName(name)
.addRoutingType(RoutingType.ANYCAST)
.addQueueConfiguration(new CoreQueueConfiguration().setName(name)
.setRoutingType(RoutingType.ANYCAST));
}
private String getDataDir() {
if (this.properties.getDataDirectory() != null) {
return this.properties.getDataDirectory();

18
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisEmbeddedConfigurationFactoryTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2017 the original author or authors.
* Copyright 2012-2018 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.
@@ -78,18 +78,22 @@ public class ArtemisEmbeddedConfigurationFactoryTests {
public void hasDlqExpiryQueueAddressSettingsConfigured() {
ArtemisProperties properties = new ArtemisProperties();
Configuration configuration = new ArtemisEmbeddedConfigurationFactory(properties)
.createConfiguration();
Map<String, AddressSettings> addressesSettings = configuration.getAddressesSettings();
assertThat((CharSequence) addressesSettings.get("#").getDeadLetterAddress()).isEqualTo(SimpleString.toSimpleString("DLQ"));
assertThat((CharSequence) addressesSettings.get("#").getExpiryAddress()).isEqualTo(SimpleString.toSimpleString("ExpiryQueue"));
.createConfiguration();
Map<String, AddressSettings> addressesSettings = configuration
.getAddressesSettings();
assertThat((Object) addressesSettings.get("#").getDeadLetterAddress())
.isEqualTo(SimpleString.toSimpleString("DLQ"));
assertThat((Object) addressesSettings.get("#").getExpiryAddress())
.isEqualTo(SimpleString.toSimpleString("ExpiryQueue"));
}
@Test
public void hasDlqExpiryQueueConfigured() {
ArtemisProperties properties = new ArtemisProperties();
Configuration configuration = new ArtemisEmbeddedConfigurationFactory(properties)
.createConfiguration();
List<CoreAddressConfiguration> addressConfigurations = configuration.getAddressConfigurations();
.createConfiguration();
List<CoreAddressConfiguration> addressConfigurations = configuration
.getAddressConfigurations();
assertThat(addressConfigurations).hasSize(2);
}
}