Skip to content

Commit 5c872f0

Browse files
fix: reorder parameters in ConnectionFactoryCustomizer interface (#154)
* fix!: reorder parameters in ConnectionFactoryCustomizer interface and its implementations * fix!: correct argument order in ConnectionFactoryCustomizer mock setup --------- Co-authored-by: lugomez <lugomez@bancolombia.com.co>
1 parent 6f8eef4 commit 5c872f0

File tree

8 files changed

+10
-10
lines changed

8 files changed

+10
-10
lines changed

docs/docs/migration-guides.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ sidebar_position: 4
1616

1717
@Bean
1818
public ConnectionFactoryCustomizer connectionFactoryCustomizer() {
19-
return (ConnectionFactoryCustomizer) (asyncProps, connectionFactory) -> {
19+
return (connectionFactory, asyncProps) -> {
2020
connectionFactory.setExceptionHandler(new MyCustomExceptionHandler()); // Optional custom exception handler
2121
connectionFactory.setCredentialsProvider(new MyCustomCredentialsProvider()); // Optional custom credentials provider
2222
return connectionFactory;

docs/docs/reactive-commons/configuration_properties/1-rabbitmq.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ or automatic recovery strategies:
200200
201201
@Bean
202202
public ConnectionFactoryCustomizer connectionFactoryCustomizer() {
203-
return (ConnectionFactoryCustomizer) (asyncProps, connectionFactory) -> {
203+
return (connectionFactory, asyncProps) -> {
204204
connectionFactory.setExceptionHandler(new MyCustomExceptionHandler()); // Optional custom exception handler
205205
connectionFactory.setCredentialsProvider(new MyCustomCredentialsProvider()); // Optional custom credentials provider
206206
return connectionFactory;

starters/async-rabbit-starter/src/main/java/org/reactivecommons/async/rabbit/ConnectionFactoryCustomizer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@
99
@FunctionalInterface
1010
public interface ConnectionFactoryCustomizer {
1111

12-
ConnectionFactory customize(AsyncProps asyncProps, ConnectionFactory connectionFactory);
12+
ConnectionFactory customize(ConnectionFactory connectionFactory, AsyncProps asyncProps);
1313

1414
}

starters/async-rabbit-starter/src/main/java/org/reactivecommons/async/rabbit/RabbitMQSetupUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ public static ConnectionFactoryProvider connectionFactoryProvider(AsyncProps asy
9494
map.from(rabbitProperties::determineVirtualHost).whenNonNull().to(newFactory::setVirtualHost);
9595
newFactory.useNio();
9696
setUpSSL(newFactory, rabbitProperties);
97-
return cfCustomizer.customize(props, newFactory);
97+
return cfCustomizer.customize(newFactory, props);
9898
} catch (Exception e) {
9999
throw new RuntimeException("Error creating ConnectionFactory: ", e);
100100
}

starters/async-rabbit-starter/src/main/java/org/reactivecommons/async/starter/impl/common/rabbit/RabbitMQConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ UnroutableMessageProcessor defaultUnroutableMessageProcessor(UnroutableMessageNo
6363
@Bean
6464
@ConditionalOnMissingBean(ConnectionFactoryCustomizer.class)
6565
public ConnectionFactoryCustomizer defaultConnectionFactoryCustomizer() {
66-
return ((asyncProps, connectionFactory) -> connectionFactory);
66+
return (connectionFactory, asyncProps) -> connectionFactory;
6767
}
6868

6969
}

starters/async-rabbit-starter/src/test/java/org/reactivecommons/async/rabbit/RabbitMQBrokerProviderFactoryTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@ void shouldReturnCreateDiscardProvider() {
7070

7171
@Test
7272
void shouldReturnBrokerProvider() {
73-
when(cfCustomizer.customize(any(AsyncProps.class), any(ConnectionFactory.class)))
74-
.thenAnswer(invocation -> invocation.<ConnectionFactory>getArgument(1));
73+
when(cfCustomizer.customize(any(ConnectionFactory.class), any(AsyncProps.class)))
74+
.thenAnswer(invocation -> invocation.<ConnectionFactory>getArgument(0));
7575

7676
// Arrange
7777
AsyncProps props = new AsyncProps();

starters/async-rabbit-starter/src/test/java/org/reactivecommons/async/rabbit/RabbitMQDiscardProviderImplTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ class RabbitMQDiscardProviderImplTest {
3030

3131
@BeforeEach
3232
void setUp() {
33-
when(cfCustomizer.customize(any(AsyncProps.class), any(ConnectionFactory.class)))
34-
.thenAnswer(invocation -> invocation.<ConnectionFactory>getArgument(1));
33+
when(cfCustomizer.customize(any(ConnectionFactory.class), any(AsyncProps.class)))
34+
.thenAnswer(invocation -> invocation.<ConnectionFactory>getArgument(0));
3535
}
3636

3737
@Test

starters/async-rabbit-starter/src/test/java/org/reactivecommons/async/starter/impl/common/rabbit/RabbitMQConfigTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ void shouldReturnSameConnectionFactoryWhenCustomizing() {
135135
ConnectionFactory originalFactory = new ConnectionFactory();
136136
AsyncProps asyncProps = new AsyncProps();
137137

138-
ConnectionFactory result = customizer.customize(asyncProps, originalFactory);
138+
ConnectionFactory result = customizer.customize(originalFactory, asyncProps);
139139

140140
assertThat(result).isSameAs(originalFactory);
141141
}

0 commit comments

Comments
 (0)