Update for compatibility with Spring Boot 3.1.6

Author: rwanderc

pom.xml

@@ -45,7 +45,7 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>17</java.version>
 
-        <springboot.version>3.1.0</springboot.version>
+        <springboot.version>3.1.6</springboot.version>
         <javax-validation.version>2.0.1.Final</javax-validation.version>
         <testcontainers-rabbitmq.version>1.17.1</testcontainers-rabbitmq.version>
         <java-jna.version>5.8.0</java-jna.version>

spring-multirabbit-examples/spring-multirabbit-example-java/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.1.0</version>
+        <version>3.1.6</version>
         <relativePath />
     </parent>
 

spring-multirabbit-examples/spring-multirabbit-example-kotlin/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.1.0</version>
+        <version>3.1.6</version>
         <relativePath />
     </parent>
 

spring-multirabbit-examples/spring-multirabbit-extension-example/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.1.0</version>
+        <version>3.1.6</version>
         <relativePath />
     </parent>
 

spring-multirabbit/src/main/java/org/springframework/boot/autoconfigure/amqp/MultiRabbitAutoConfiguration.java

@@ -60,7 +60,7 @@ public class MultiRabbitAutoConfiguration {
     @Bean(MultiRabbitConstants.CONNECTION_FACTORY_CREATOR_BEAN_NAME)
     @ConditionalOnProperty(prefix = "spring.multirabbitmq", name = "enabled", havingValue = "true")
     public RabbitConnectionFactoryCreator rabbitConnectionFactoryCreator(final RabbitProperties properties) {
-        return new RabbitConnectionFactoryCreator(properties, null);
+        return new RabbitConnectionFactoryCreator(properties);
     }
 
     @Primary

spring-multirabbit/src/main/java/org/springframework/boot/autoconfigure/amqp/MultiRabbitConnectionFactoryCreatorMap.java

@@ -30,7 +30,7 @@ private static Map<String, RabbitConnectionFactoryCreator> toFactoryCreator(
         }
         return multiRabbitProperties.getConnections().entrySet().stream().collect(Collectors.toMap(
                 Map.Entry::getKey,
-                e -> new RabbitConnectionFactoryCreator(e.getValue(), null)));
+                e -> new RabbitConnectionFactoryCreator(e.getValue())));
     }
 
     Map<String, RabbitConnectionFactoryCreator> getMap() {

spring-multirabbit/src/test/java/org/springframework/boot/autoconfigure/amqp/MultiRabbitConnectionFactoryCreatorMapTest.java

@@ -27,7 +27,7 @@ void shouldCreateWithRabbitConnectionFactoryCreatorMap() {
         final RabbitProperties rabbitProperties = new RabbitProperties();
 
         final Map<String, RabbitConnectionFactoryCreator> creators
-                = Map.of(dummyKey, new RabbitConnectionFactoryCreator(rabbitProperties, null));
+                = Map.of(dummyKey, new RabbitConnectionFactoryCreator(rabbitProperties));
 
         final MultiRabbitConnectionFactoryCreatorMap multiRabbitConnectionFactoryCreatorMap
                 = new MultiRabbitConnectionFactoryCreatorMap(creators);

spring-multirabbit/src/test/java/org/springframework/boot/autoconfigure/amqp/MultiRabbitConnectionFactoryCreatorTest.java

@@ -375,7 +375,7 @@ void shouldEncapsulateExceptionWhenFailingToCreateBean() throws Exception {
         final MultiRabbitConnectionDetailsMap multiRabbitConnectionDetailsMap
                 = new PropertiesMultiRabbitConnectionDetailsMap(multiRabbitProperties);
         final RabbitConnectionFactoryCreator rabbitConnectionFactoryCreator
-                = new RabbitConnectionFactoryCreator(rabbitProperties, null);
+                = new RabbitConnectionFactoryCreator(rabbitProperties);
         final MultiRabbitConnectionFactoryCreatorMap multiRabbitConnectionFactoryCreatorMap
                 = new MultiRabbitConnectionFactoryCreatorMap(Map.of(DUMMY_KEY, multiRabbitConnectionFactoryCreator));