From 9bfbd5ac0a625448cc782b468a8145d2a17a6aa5 Mon Sep 17 00:00:00 2001
From: Juan C Galvis <8420868+juancgalvis@users.noreply.github.com>
Date: Mon, 9 Jun 2025 10:50:49 -0500
Subject: [PATCH] fix(discard): Allow easy discard notifier overriding

---
 .../async/commons/DiscardNotifier.java            |  2 --
 .../rabbit/RabbitMQBrokerProviderFactory.java     |  4 +++-
 .../discard/RabbitMQDiscardProviderConfig.java    | 15 +++++++++++++++
 .../discard/RabbitMQDiscardProviderFactory.java   | 10 ++++++++++
 .../RabbitMQDiscardProviderImpl.java}             |  5 +++--
 .../impl/common/rabbit/RabbitMQConfig.java        |  3 ++-
 .../rabbit/RabbitMQBrokerProviderFactoryTest.java |  7 +++++--
 ....java => RabbitMQDiscardProviderImplTest.java} |  5 +++--
 8 files changed, 41 insertions(+), 10 deletions(-)
 create mode 100644 starters/async-rabbit-starter/src/main/java/org/reactivecommons/async/rabbit/discard/RabbitMQDiscardProviderConfig.java
 create mode 100644 starters/async-rabbit-starter/src/main/java/org/reactivecommons/async/rabbit/discard/RabbitMQDiscardProviderFactory.java
 rename starters/async-rabbit-starter/src/main/java/org/reactivecommons/async/rabbit/{RabbitMQDiscardProvider.java => discard/RabbitMQDiscardProviderImpl.java} (89%)
 rename starters/async-rabbit-starter/src/test/java/org/reactivecommons/async/rabbit/{RabbitMQDiscardProviderTest.java => RabbitMQDiscardProviderImplTest.java} (85%)

diff --git a/async/async-commons/src/main/java/org/reactivecommons/async/commons/DiscardNotifier.java b/async/async-commons/src/main/java/org/reactivecommons/async/commons/DiscardNotifier.java
index 82e638b6..f698809b 100644
--- a/async/async-commons/src/main/java/org/reactivecommons/async/commons/DiscardNotifier.java
+++ b/async/async-commons/src/main/java/org/reactivecommons/async/commons/DiscardNotifier.java
@@ -4,7 +4,5 @@
 import reactor.core.publisher.Mono;
 
 public interface DiscardNotifier {
-
     Mono<Void> notifyDiscard(Message message);
-
 }
diff --git a/starters/async-rabbit-starter/src/main/java/org/reactivecommons/async/rabbit/RabbitMQBrokerProviderFactory.java b/starters/async-rabbit-starter/src/main/java/org/reactivecommons/async/rabbit/RabbitMQBrokerProviderFactory.java
index 1dd5fb9f..59a2fa3b 100644
--- a/starters/async-rabbit-starter/src/main/java/org/reactivecommons/async/rabbit/RabbitMQBrokerProviderFactory.java
+++ b/starters/async-rabbit-starter/src/main/java/org/reactivecommons/async/rabbit/RabbitMQBrokerProviderFactory.java
@@ -12,6 +12,7 @@
 import org.reactivecommons.async.rabbit.config.RabbitProperties;
 import org.reactivecommons.async.rabbit.config.props.AsyncProps;
 import org.reactivecommons.async.rabbit.converters.json.RabbitJacksonMessageConverter;
+import org.reactivecommons.async.rabbit.discard.RabbitMQDiscardProviderFactory;
 import org.reactivecommons.async.rabbit.health.RabbitReactiveHealthIndicator;
 import org.reactivecommons.async.starter.broker.BrokerProvider;
 import org.reactivecommons.async.starter.broker.BrokerProviderFactory;
@@ -26,6 +27,7 @@ public class RabbitMQBrokerProviderFactory implements BrokerProviderFactory<Asyn
     private final RabbitJacksonMessageConverter converter;
     private final MeterRegistry meterRegistry;
     private final CustomReporter errorReporter;
+    private final RabbitMQDiscardProviderFactory discardProvider;
 
     @Override
     public String getBrokerType() {
@@ -34,7 +36,7 @@ public String getBrokerType() {
 
     @Override
     public DiscardProvider getDiscardProvider(AsyncProps props) {
-        return new RabbitMQDiscardProvider(props, config, converter);
+        return discardProvider.build(props, config, converter);
     }
 
     @Override
diff --git a/starters/async-rabbit-starter/src/main/java/org/reactivecommons/async/rabbit/discard/RabbitMQDiscardProviderConfig.java b/starters/async-rabbit-starter/src/main/java/org/reactivecommons/async/rabbit/discard/RabbitMQDiscardProviderConfig.java
new file mode 100644
index 00000000..e64136d9
--- /dev/null
+++ b/starters/async-rabbit-starter/src/main/java/org/reactivecommons/async/rabbit/discard/RabbitMQDiscardProviderConfig.java
@@ -0,0 +1,15 @@
+package org.reactivecommons.async.rabbit.discard;
+
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class RabbitMQDiscardProviderConfig {
+
+    @Bean
+    @ConditionalOnMissingBean(RabbitMQDiscardProviderFactory.class)
+    public RabbitMQDiscardProviderFactory defaultRabbitMQDiscardProviderFactory() {
+        return RabbitMQDiscardProviderImpl::new;
+    }
+}
diff --git a/starters/async-rabbit-starter/src/main/java/org/reactivecommons/async/rabbit/discard/RabbitMQDiscardProviderFactory.java b/starters/async-rabbit-starter/src/main/java/org/reactivecommons/async/rabbit/discard/RabbitMQDiscardProviderFactory.java
new file mode 100644
index 00000000..62bf9fb3
--- /dev/null
+++ b/starters/async-rabbit-starter/src/main/java/org/reactivecommons/async/rabbit/discard/RabbitMQDiscardProviderFactory.java
@@ -0,0 +1,10 @@
+package org.reactivecommons.async.rabbit.discard;
+
+import org.reactivecommons.async.commons.config.BrokerConfig;
+import org.reactivecommons.async.commons.converters.MessageConverter;
+import org.reactivecommons.async.rabbit.config.props.AsyncProps;
+import org.reactivecommons.async.starter.broker.DiscardProvider;
+
+public interface RabbitMQDiscardProviderFactory {
+    DiscardProvider build(AsyncProps props, BrokerConfig config, MessageConverter converter);
+}
diff --git a/starters/async-rabbit-starter/src/main/java/org/reactivecommons/async/rabbit/RabbitMQDiscardProvider.java b/starters/async-rabbit-starter/src/main/java/org/reactivecommons/async/rabbit/discard/RabbitMQDiscardProviderImpl.java
similarity index 89%
rename from starters/async-rabbit-starter/src/main/java/org/reactivecommons/async/rabbit/RabbitMQDiscardProvider.java
rename to starters/async-rabbit-starter/src/main/java/org/reactivecommons/async/rabbit/discard/RabbitMQDiscardProviderImpl.java
index 9db580c3..c7ba46d7 100644
--- a/starters/async-rabbit-starter/src/main/java/org/reactivecommons/async/rabbit/RabbitMQDiscardProvider.java
+++ b/starters/async-rabbit-starter/src/main/java/org/reactivecommons/async/rabbit/discard/RabbitMQDiscardProviderImpl.java
@@ -1,9 +1,10 @@
-package org.reactivecommons.async.rabbit;
+package org.reactivecommons.async.rabbit.discard;
 
 import lombok.RequiredArgsConstructor;
 import org.reactivecommons.async.commons.DiscardNotifier;
 import org.reactivecommons.async.commons.config.BrokerConfig;
 import org.reactivecommons.async.commons.converters.MessageConverter;
+import org.reactivecommons.async.rabbit.RabbitMQSetupUtils;
 import org.reactivecommons.async.rabbit.communications.ReactiveMessageSender;
 import org.reactivecommons.async.rabbit.config.ConnectionFactoryProvider;
 import org.reactivecommons.async.rabbit.config.RabbitProperties;
@@ -14,7 +15,7 @@
 import java.util.concurrent.ConcurrentHashMap;
 
 @RequiredArgsConstructor
-public class RabbitMQDiscardProvider implements DiscardProvider {
+public class RabbitMQDiscardProviderImpl implements DiscardProvider {
     private final AsyncProps props;
     private final BrokerConfig config;
     private final MessageConverter converter;
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 1345923e..40a127f4 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
@@ -9,6 +9,7 @@
 import org.reactivecommons.async.rabbit.config.props.AsyncPropsDomain;
 import org.reactivecommons.async.rabbit.config.props.AsyncRabbitPropsDomainProperties;
 import org.reactivecommons.async.rabbit.converters.json.RabbitJacksonMessageConverter;
+import org.reactivecommons.async.rabbit.discard.RabbitMQDiscardProviderConfig;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
@@ -19,7 +20,7 @@
 @Configuration
 @RequiredArgsConstructor
 @EnableConfigurationProperties({RabbitPropertiesAutoConfig.class, AsyncRabbitPropsDomainProperties.class})
-@Import({AsyncPropsDomain.class, RabbitMQBrokerProviderFactory.class})
+@Import({AsyncPropsDomain.class, RabbitMQBrokerProviderFactory.class, RabbitMQDiscardProviderConfig.class})
 public class RabbitMQConfig {
 
     @Bean
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 534db7cf..28448222 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
@@ -14,6 +14,8 @@
 import org.reactivecommons.async.rabbit.config.props.AsyncProps;
 import org.reactivecommons.async.rabbit.config.props.BrokerConfigProps;
 import org.reactivecommons.async.rabbit.converters.json.RabbitJacksonMessageConverter;
+import org.reactivecommons.async.rabbit.discard.RabbitMQDiscardProviderFactory;
+import org.reactivecommons.async.rabbit.discard.RabbitMQDiscardProviderImpl;
 import org.reactivecommons.async.starter.broker.BrokerProvider;
 import org.reactivecommons.async.starter.broker.BrokerProviderFactory;
 import org.reactivecommons.async.starter.broker.DiscardProvider;
@@ -36,7 +38,8 @@ class RabbitMQBrokerProviderFactoryTest {
 
     @BeforeEach
     public void setUp() {
-        providerFactory = new RabbitMQBrokerProviderFactory(config, router, converter, meterRegistry, errorReporter);
+        providerFactory = new RabbitMQBrokerProviderFactory(config, router, converter, meterRegistry, errorReporter,
+                RabbitMQDiscardProviderImpl::new);
     }
 
     @Test
@@ -55,7 +58,7 @@ void shouldReturnCreateDiscardProvider() {
         // Act
         DiscardProvider discardProvider = providerFactory.getDiscardProvider(props);
         // Assert
-        assertThat(discardProvider).isInstanceOf(RabbitMQDiscardProvider.class);
+        assertThat(discardProvider).isInstanceOf(RabbitMQDiscardProviderImpl.class);
     }
 
     @Test
diff --git a/starters/async-rabbit-starter/src/test/java/org/reactivecommons/async/rabbit/RabbitMQDiscardProviderTest.java b/starters/async-rabbit-starter/src/test/java/org/reactivecommons/async/rabbit/RabbitMQDiscardProviderImplTest.java
similarity index 85%
rename from starters/async-rabbit-starter/src/test/java/org/reactivecommons/async/rabbit/RabbitMQDiscardProviderTest.java
rename to starters/async-rabbit-starter/src/test/java/org/reactivecommons/async/rabbit/RabbitMQDiscardProviderImplTest.java
index 5243b48a..c2ce4338 100644
--- a/starters/async-rabbit-starter/src/test/java/org/reactivecommons/async/rabbit/RabbitMQDiscardProviderTest.java
+++ b/starters/async-rabbit-starter/src/test/java/org/reactivecommons/async/rabbit/RabbitMQDiscardProviderImplTest.java
@@ -12,11 +12,12 @@
 import org.reactivecommons.async.rabbit.config.props.AsyncProps;
 import org.reactivecommons.async.rabbit.config.props.BrokerConfigProps;
 import org.reactivecommons.async.rabbit.converters.json.RabbitJacksonMessageConverter;
+import org.reactivecommons.async.rabbit.discard.RabbitMQDiscardProviderImpl;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 @ExtendWith(MockitoExtension.class)
-class RabbitMQDiscardProviderTest {
+class RabbitMQDiscardProviderImplTest {
     @Mock
     private RabbitJacksonMessageConverter converter;
 
@@ -28,7 +29,7 @@ void shouldCreateDiscardNotifier() {
         IBrokerConfigProps brokerConfigProps = new BrokerConfigProps(props);
         props.setBrokerConfigProps(brokerConfigProps);
         BrokerConfig brokerConfig = new BrokerConfig();
-        RabbitMQDiscardProvider discardProvider = new RabbitMQDiscardProvider(props, brokerConfig, converter);
+        RabbitMQDiscardProviderImpl discardProvider = new RabbitMQDiscardProviderImpl(props, brokerConfig, converter);
         // Act
         DiscardNotifier notifier = discardProvider.get();
         // Assert