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

Upgrade to Artemis 2.35.0

Browse Source 
Closes gh-41400
This commit is contained in:
Andy Wilkinson
2024-07-09 13:04:33 +01:00
parent 16d4329a63
commit d96cc210ae
5 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
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-2023 the original author or authors.
* Copyright 2012-2024 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.
@@ -69,16 +69,15 @@ class ArtemisEmbeddedConfigurationFactory {
configuration.setClusterPassword(this.properties.getClusterPassword());
configuration.addAddressConfiguration(createAddressConfiguration("DLQ"));
configuration.addAddressConfiguration(createAddressConfiguration("ExpiryQueue"));
configuration.addAddressSetting("#",
new AddressSettings().setDeadLetterAddress(SimpleString.toSimpleString("DLQ"))
.setExpiryAddress(SimpleString.toSimpleString("ExpiryQueue")));
configuration.addAddressSetting("#", new AddressSettings().setDeadLetterAddress(SimpleString.of("DLQ"))
.setExpiryAddress(SimpleString.of("ExpiryQueue")));
return configuration;
}
private CoreAddressConfiguration createAddressConfiguration(String name) {
return new CoreAddressConfiguration().setName(name)
.addRoutingType(RoutingType.ANYCAST)
.addQueueConfiguration(new QueueConfiguration(name).setRoutingType(RoutingType.ANYCAST).setAddress(name));
.addQueueConfiguration(QueueConfiguration.of(name).setRoutingType(RoutingType.ANYCAST).setAddress(name));
}
private String getDataDir() {

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

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2023 the original author or authors.
* Copyright 2012-2024 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.
@@ -68,7 +68,8 @@ class ArtemisEmbeddedServerConfiguration {
String queueName = queueConfiguration.getName();
configuration.addAddressConfiguration(new CoreAddressConfiguration().setName(queueName)
.addRoutingType(RoutingType.ANYCAST)
.addQueueConfiguration(new QueueConfiguration(queueName).setAddress(queueName)
.addQueueConfiguration(QueueConfiguration.of(queueName)
.setAddress(queueName)
.setFilterString(queueConfiguration.getSelector())
.setDurable(queueConfiguration.isDurable())
.setRoutingType(RoutingType.ANYCAST)));

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

@@ -449,7 +449,7 @@ class ArtemisAutoConfigurationTests {
void checkDestination(String name, RoutingType routingType, boolean shouldExist) {
try {
BindingQueryResult result = this.server.bindingQuery(new SimpleString(name));
BindingQueryResult result = this.server.bindingQuery(SimpleString.of(name));
assertThat(result.isExists()).isEqualTo(shouldExist);
if (shouldExist) {
assertThat(result.getAddressInfo().getRoutingType()).isEqualTo(routingType);

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

@@ -75,10 +75,8 @@ class ArtemisEmbeddedConfigurationFactoryTests {
ArtemisProperties properties = new ArtemisProperties();
Configuration configuration = new ArtemisEmbeddedConfigurationFactory(properties).createConfiguration();
Map<String, AddressSettings> addressSettings = configuration.getAddressSettings();
assertThat((Object) addressSettings.get("#").getDeadLetterAddress())
.isEqualTo(SimpleString.toSimpleString("DLQ"));
assertThat((Object) addressSettings.get("#").getExpiryAddress())
.isEqualTo(SimpleString.toSimpleString("ExpiryQueue"));
assertThat((Object) addressSettings.get("#").getDeadLetterAddress()).isEqualTo(SimpleString.of("DLQ"));
assertThat((Object) addressSettings.get("#").getExpiryAddress()).isEqualTo(SimpleString.of("ExpiryQueue"));
}
@Test

2
spring-boot-project/spring-boot-dependencies/build.gradle
View File

@@ -73,7 +73,7 @@ bom {
releaseNotes("https://github.com/eclipse-ee4j/angus-mail/releases/tag/{version}")
}
}
library("Artemis", "2.33.0") {
library("Artemis", "2.35.0") {
group("org.apache.activemq") {
imports = [
"artemis-bom"