Skip to content

fix(discard): Allow easy discard notifier overriding #144

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 9, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,5 @@
import reactor.core.publisher.Mono;

public interface DiscardNotifier {

Mono<Void> notifyDiscard(Message message);

}
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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() {
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
}
}
Original file line number Diff line number Diff line change
@@ -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);
}
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
Expand All @@ -55,7 +58,7 @@ void shouldReturnCreateDiscardProvider() {
// Act
DiscardProvider discardProvider = providerFactory.getDiscardProvider(props);
// Assert
assertThat(discardProvider).isInstanceOf(RabbitMQDiscardProvider.class);
assertThat(discardProvider).isInstanceOf(RabbitMQDiscardProviderImpl.class);
}

@Test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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
Expand Down