From 277153543795836d47c905cac4dc1666b12c55ab Mon Sep 17 00:00:00 2001 From: lugomez Date: Tue, 23 Sep 2025 18:06:29 -0500 Subject: [PATCH 1/2] fix!: reorder parameters in ConnectionFactoryCustomizer interface and its implementations --- docs/docs/migration-guides.md | 2 +- .../reactive-commons/configuration_properties/1-rabbitmq.md | 2 +- .../async/rabbit/ConnectionFactoryCustomizer.java | 2 +- .../org/reactivecommons/async/rabbit/RabbitMQSetupUtils.java | 2 +- .../async/starter/impl/common/rabbit/RabbitMQConfig.java | 2 +- .../async/rabbit/RabbitMQBrokerProviderFactoryTest.java | 2 +- .../async/rabbit/RabbitMQDiscardProviderImplTest.java | 2 +- .../async/starter/impl/common/rabbit/RabbitMQConfigTest.java | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/docs/migration-guides.md b/docs/docs/migration-guides.md index acdcbee8..ae4b8696 100644 --- a/docs/docs/migration-guides.md +++ b/docs/docs/migration-guides.md @@ -16,7 +16,7 @@ sidebar_position: 4 @Bean public ConnectionFactoryCustomizer connectionFactoryCustomizer() { - return (ConnectionFactoryCustomizer) (asyncProps, connectionFactory) -> { + return (connectionFactory, asyncProps) -> { connectionFactory.setExceptionHandler(new MyCustomExceptionHandler()); // Optional custom exception handler connectionFactory.setCredentialsProvider(new MyCustomCredentialsProvider()); // Optional custom credentials provider return connectionFactory; diff --git a/docs/docs/reactive-commons/configuration_properties/1-rabbitmq.md b/docs/docs/reactive-commons/configuration_properties/1-rabbitmq.md index af28a614..201baace 100644 --- a/docs/docs/reactive-commons/configuration_properties/1-rabbitmq.md +++ b/docs/docs/reactive-commons/configuration_properties/1-rabbitmq.md @@ -200,7 +200,7 @@ or automatic recovery strategies: @Bean public ConnectionFactoryCustomizer connectionFactoryCustomizer() { - return (ConnectionFactoryCustomizer) (asyncProps, connectionFactory) -> { + return (connectionFactory, asyncProps) -> { connectionFactory.setExceptionHandler(new MyCustomExceptionHandler()); // Optional custom exception handler connectionFactory.setCredentialsProvider(new MyCustomCredentialsProvider()); // Optional custom credentials provider return connectionFactory; diff --git a/starters/async-rabbit-starter/src/main/java/org/reactivecommons/async/rabbit/ConnectionFactoryCustomizer.java b/starters/async-rabbit-starter/src/main/java/org/reactivecommons/async/rabbit/ConnectionFactoryCustomizer.java index 1ecaf204..80a9fe90 100644 --- a/starters/async-rabbit-starter/src/main/java/org/reactivecommons/async/rabbit/ConnectionFactoryCustomizer.java +++ b/starters/async-rabbit-starter/src/main/java/org/reactivecommons/async/rabbit/ConnectionFactoryCustomizer.java @@ -9,6 +9,6 @@ @FunctionalInterface public interface ConnectionFactoryCustomizer { - ConnectionFactory customize(AsyncProps asyncProps, ConnectionFactory connectionFactory); + ConnectionFactory customize(ConnectionFactory connectionFactory, AsyncProps asyncProps); } diff --git a/starters/async-rabbit-starter/src/main/java/org/reactivecommons/async/rabbit/RabbitMQSetupUtils.java b/starters/async-rabbit-starter/src/main/java/org/reactivecommons/async/rabbit/RabbitMQSetupUtils.java index 923ef2e9..30de2d3d 100644 --- a/starters/async-rabbit-starter/src/main/java/org/reactivecommons/async/rabbit/RabbitMQSetupUtils.java +++ b/starters/async-rabbit-starter/src/main/java/org/reactivecommons/async/rabbit/RabbitMQSetupUtils.java @@ -94,7 +94,7 @@ public static ConnectionFactoryProvider connectionFactoryProvider(AsyncProps asy map.from(rabbitProperties::determineVirtualHost).whenNonNull().to(newFactory::setVirtualHost); newFactory.useNio(); setUpSSL(newFactory, rabbitProperties); - return cfCustomizer.customize(props, newFactory); + return cfCustomizer.customize(newFactory, props); } catch (Exception e) { throw new RuntimeException("Error creating ConnectionFactory: ", e); } diff --git a/starters/async-rabbit-starter/src/main/java/org/reactivecommons/async/starter/impl/common/rabbit/RabbitMQConfig.java b/starters/async-rabbit-starter/src/main/java/org/reactivecommons/async/starter/impl/common/rabbit/RabbitMQConfig.java index 29ca59c1..e096196c 100644 --- a/starters/async-rabbit-starter/src/main/java/org/reactivecommons/async/starter/impl/common/rabbit/RabbitMQConfig.java +++ b/starters/async-rabbit-starter/src/main/java/org/reactivecommons/async/starter/impl/common/rabbit/RabbitMQConfig.java @@ -63,7 +63,7 @@ UnroutableMessageProcessor defaultUnroutableMessageProcessor(UnroutableMessageNo @Bean @ConditionalOnMissingBean(ConnectionFactoryCustomizer.class) public ConnectionFactoryCustomizer defaultConnectionFactoryCustomizer() { - return ((asyncProps, connectionFactory) -> connectionFactory); + return (connectionFactory, asyncProps) -> connectionFactory; } } diff --git a/starters/async-rabbit-starter/src/test/java/org/reactivecommons/async/rabbit/RabbitMQBrokerProviderFactoryTest.java b/starters/async-rabbit-starter/src/test/java/org/reactivecommons/async/rabbit/RabbitMQBrokerProviderFactoryTest.java index ff49c4b0..4855c9f2 100644 --- a/starters/async-rabbit-starter/src/test/java/org/reactivecommons/async/rabbit/RabbitMQBrokerProviderFactoryTest.java +++ b/starters/async-rabbit-starter/src/test/java/org/reactivecommons/async/rabbit/RabbitMQBrokerProviderFactoryTest.java @@ -70,7 +70,7 @@ void shouldReturnCreateDiscardProvider() { @Test void shouldReturnBrokerProvider() { - when(cfCustomizer.customize(any(AsyncProps.class), any(ConnectionFactory.class))) + when(cfCustomizer.customize(any(ConnectionFactory.class), any(AsyncProps.class))) .thenAnswer(invocation -> invocation.getArgument(1)); // Arrange diff --git a/starters/async-rabbit-starter/src/test/java/org/reactivecommons/async/rabbit/RabbitMQDiscardProviderImplTest.java b/starters/async-rabbit-starter/src/test/java/org/reactivecommons/async/rabbit/RabbitMQDiscardProviderImplTest.java index cdfea8ad..be86d2bc 100644 --- a/starters/async-rabbit-starter/src/test/java/org/reactivecommons/async/rabbit/RabbitMQDiscardProviderImplTest.java +++ b/starters/async-rabbit-starter/src/test/java/org/reactivecommons/async/rabbit/RabbitMQDiscardProviderImplTest.java @@ -30,7 +30,7 @@ class RabbitMQDiscardProviderImplTest { @BeforeEach void setUp() { - when(cfCustomizer.customize(any(AsyncProps.class), any(ConnectionFactory.class))) + when(cfCustomizer.customize(any(ConnectionFactory.class), any(AsyncProps.class))) .thenAnswer(invocation -> invocation.getArgument(1)); } diff --git a/starters/async-rabbit-starter/src/test/java/org/reactivecommons/async/starter/impl/common/rabbit/RabbitMQConfigTest.java b/starters/async-rabbit-starter/src/test/java/org/reactivecommons/async/starter/impl/common/rabbit/RabbitMQConfigTest.java index 32986a06..d95f8583 100644 --- a/starters/async-rabbit-starter/src/test/java/org/reactivecommons/async/starter/impl/common/rabbit/RabbitMQConfigTest.java +++ b/starters/async-rabbit-starter/src/test/java/org/reactivecommons/async/starter/impl/common/rabbit/RabbitMQConfigTest.java @@ -135,7 +135,7 @@ void shouldReturnSameConnectionFactoryWhenCustomizing() { ConnectionFactory originalFactory = new ConnectionFactory(); AsyncProps asyncProps = new AsyncProps(); - ConnectionFactory result = customizer.customize(asyncProps, originalFactory); + ConnectionFactory result = customizer.customize(originalFactory, asyncProps); assertThat(result).isSameAs(originalFactory); } From c58f090b0fffbab9f8fd2c1acbd09be544649c8a Mon Sep 17 00:00:00 2001 From: lugomez Date: Tue, 23 Sep 2025 18:27:22 -0500 Subject: [PATCH 2/2] fix!: correct argument order in ConnectionFactoryCustomizer mock setup --- .../async/rabbit/RabbitMQBrokerProviderFactoryTest.java | 2 +- .../async/rabbit/RabbitMQDiscardProviderImplTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/starters/async-rabbit-starter/src/test/java/org/reactivecommons/async/rabbit/RabbitMQBrokerProviderFactoryTest.java b/starters/async-rabbit-starter/src/test/java/org/reactivecommons/async/rabbit/RabbitMQBrokerProviderFactoryTest.java index 4855c9f2..08985347 100644 --- a/starters/async-rabbit-starter/src/test/java/org/reactivecommons/async/rabbit/RabbitMQBrokerProviderFactoryTest.java +++ b/starters/async-rabbit-starter/src/test/java/org/reactivecommons/async/rabbit/RabbitMQBrokerProviderFactoryTest.java @@ -71,7 +71,7 @@ void shouldReturnCreateDiscardProvider() { @Test void shouldReturnBrokerProvider() { when(cfCustomizer.customize(any(ConnectionFactory.class), any(AsyncProps.class))) - .thenAnswer(invocation -> invocation.getArgument(1)); + .thenAnswer(invocation -> invocation.getArgument(0)); // Arrange AsyncProps props = new AsyncProps(); diff --git a/starters/async-rabbit-starter/src/test/java/org/reactivecommons/async/rabbit/RabbitMQDiscardProviderImplTest.java b/starters/async-rabbit-starter/src/test/java/org/reactivecommons/async/rabbit/RabbitMQDiscardProviderImplTest.java index be86d2bc..52aa0fc5 100644 --- a/starters/async-rabbit-starter/src/test/java/org/reactivecommons/async/rabbit/RabbitMQDiscardProviderImplTest.java +++ b/starters/async-rabbit-starter/src/test/java/org/reactivecommons/async/rabbit/RabbitMQDiscardProviderImplTest.java @@ -31,7 +31,7 @@ class RabbitMQDiscardProviderImplTest { @BeforeEach void setUp() { when(cfCustomizer.customize(any(ConnectionFactory.class), any(AsyncProps.class))) - .thenAnswer(invocation -> invocation.getArgument(1)); + .thenAnswer(invocation -> invocation.getArgument(0)); } @Test