Skip to content

Commit 18d3968

Browse files
juancgalvisjuancgalvis
committed
fix(error-reporter): Restore CustomReporter to default rabbit config
1 parent e544b1c commit 18d3968

File tree

8 files changed

+49
-34
lines changed

8 files changed

+49
-34
lines changed

‎async/async-rabbit/src/main/java/org/reactivecommons/async/rabbit/DynamicRegistryImp.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import lombok.RequiredArgsConstructor;
55
import org.reactivecommons.async.api.DynamicRegistry;
66
import org.reactivecommons.async.api.handlers.DomainEventHandler;
7-
import org.reactivecommons.async.api.handlers.EventHandler;
87
import org.reactivecommons.async.api.handlers.QueryHandler;
98
import org.reactivecommons.async.api.handlers.QueryHandlerDelegate;
109
import org.reactivecommons.async.api.handlers.registered.RegisteredEventListener;
@@ -33,7 +32,8 @@ public <T> Mono<Void> listenEvent(String eventName, DomainEventHandler<T> fn, Cl
3332

3433
@Override
3534
public <T, R> void serveQuery(String resource, QueryHandler<T, R> handler, Class<R> queryClass) {
36-
resolver.addQueryHandler(new RegisteredQueryHandler<>(resource, (ignored, message) -> handler.handle(message), queryClass));
35+
resolver.addQueryHandler(new RegisteredQueryHandler<>(resource, (ignored, message) -> handler.handle(message)
36+
, queryClass));
3737
}
3838

3939
@Override

‎starters/async-commons-starter/src/main/java/org/reactivecommons/async/starter/config/ReactiveCommonsConfig.java‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
import org.reactivecommons.async.commons.config.BrokerConfig;
99
import org.reactivecommons.async.commons.converters.json.DefaultObjectMapperSupplier;
1010
import org.reactivecommons.async.commons.converters.json.ObjectMapperSupplier;
11+
import org.reactivecommons.async.commons.ext.CustomReporter;
12+
import org.reactivecommons.async.commons.ext.DefaultCustomReporter;
1113
import org.reactivecommons.async.commons.reply.ReactiveReplyRouter;
1214
import org.reactivecommons.async.starter.broker.BrokerProvider;
1315
import org.reactivecommons.async.starter.broker.BrokerProviderFactory;
@@ -30,7 +32,7 @@
3032
@Configuration
3133
@RequiredArgsConstructor
3234
@Import(ReactiveCommonsHealthConfig.class)
33-
@ComponentScan("org.reactivecommons.async.starter.impl")
35+
@ComponentScan("org.reactivecommons.async.starter.impl.common")
3436
public class ReactiveCommonsConfig {
3537

3638
@Bean
@@ -89,4 +91,10 @@ public MeterRegistry defaultRabbitMeterRegistry() {
8991
return new SimpleMeterRegistry();
9092
}
9193

94+
@Bean
95+
@ConditionalOnMissingBean
96+
public CustomReporter reactiveCommonsCustomErrorReporter() {
97+
return new DefaultCustomReporter();
98+
}
99+
92100
}

‎starters/async-commons-starter/src/main/java/org/reactivecommons/async/starter/config/ReactiveCommonsListenersConfig.java‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
1414
import org.springframework.context.ApplicationContext;
1515
import org.springframework.context.annotation.Bean;
16+
import org.springframework.context.annotation.ComponentScan;
1617
import org.springframework.context.annotation.Configuration;
1718
import reactor.core.publisher.Mono;
1819

@@ -21,6 +22,7 @@
2122
@Log
2223
@Configuration
2324
@RequiredArgsConstructor
25+
@ComponentScan("org.reactivecommons.async.starter.impl.listener")
2426
public class ReactiveCommonsListenersConfig {
2527

2628
@Bean
@@ -41,12 +43,6 @@ public DomainHandlers buildHandlers(ApplicationContext context,
4143
return handlers;
4244
}
4345

44-
@Bean
45-
@ConditionalOnMissingBean
46-
public CustomReporter reactiveCommonsCustomErrorReporter() {
47-
return new DefaultCustomReporter();
48-
}
49-
5046
@Bean
5147
@ConditionalOnMissingBean
5248
@SuppressWarnings("rawtypes")

starters/async-kafka-starter/src/main/java/org/reactivecommons/async/starter/impl/kafka/RCKafkaConfig.java renamed to starters/async-kafka-starter/src/main/java/org/reactivecommons/async/starter/impl/common/kafka/RCKafkaConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.reactivecommons.async.starter.impl.kafka;
1+
package org.reactivecommons.async.starter.impl.common.kafka;
22

33
import org.reactivecommons.async.commons.converters.json.ObjectMapperSupplier;
44
import org.reactivecommons.async.kafka.KafkaBrokerProviderFactory;

starters/async-kafka-starter/src/test/java/org/reactivecommons/async/starter/impl/rabbit/KafkaConfigTest.java renamed to starters/async-kafka-starter/src/test/java/org/reactivecommons/async/starter/impl/common/kafka/KafkaConfigTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.reactivecommons.async.starter.impl.rabbit;
1+
package org.reactivecommons.async.starter.impl.common.kafka;
22

33

44
import org.junit.jupiter.api.Test;
@@ -8,7 +8,6 @@
88
import org.reactivecommons.async.starter.config.ConnectionManager;
99
import org.reactivecommons.async.starter.config.ReactiveCommonsConfig;
1010
import org.reactivecommons.async.starter.config.ReactiveCommonsListenersConfig;
11-
import org.reactivecommons.async.starter.impl.kafka.RCKafkaConfig;
1211
import org.springframework.beans.factory.annotation.Autowired;
1312
import org.springframework.boot.test.context.SpringBootTest;
1413

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

Lines changed: 3 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,20 @@
1-
package org.reactivecommons.async.starter.impl.rabbit;
1+
package org.reactivecommons.async.starter.impl.common.rabbit;
22

33
import lombok.RequiredArgsConstructor;
44
import lombok.extern.java.Log;
5-
import org.reactivecommons.async.api.DynamicRegistry;
6-
import org.reactivecommons.async.commons.config.IBrokerConfigProps;
75
import org.reactivecommons.async.commons.converters.json.ObjectMapperSupplier;
8-
import org.reactivecommons.async.rabbit.DynamicRegistryImp;
96
import org.reactivecommons.async.rabbit.RabbitMQBrokerProviderFactory;
10-
import org.reactivecommons.async.rabbit.RabbitMQSetupUtils;
11-
import org.reactivecommons.async.rabbit.communications.TopologyCreator;
127
import org.reactivecommons.async.rabbit.config.RabbitProperties;
138
import org.reactivecommons.async.rabbit.config.RabbitPropertiesAutoConfig;
14-
import org.reactivecommons.async.rabbit.config.props.AsyncProps;
159
import org.reactivecommons.async.rabbit.config.props.AsyncPropsDomain;
1610
import org.reactivecommons.async.rabbit.config.props.AsyncRabbitPropsDomainProperties;
17-
import org.reactivecommons.async.rabbit.config.props.BrokerConfigProps;
1811
import org.reactivecommons.async.rabbit.converters.json.RabbitJacksonMessageConverter;
19-
import org.reactivecommons.async.starter.config.DomainHandlers;
2012
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
2113
import org.springframework.boot.context.properties.EnableConfigurationProperties;
2214
import org.springframework.context.annotation.Bean;
2315
import org.springframework.context.annotation.Configuration;
2416
import org.springframework.context.annotation.Import;
2517

26-
import static org.reactivecommons.async.api.HandlerRegistry.DEFAULT_DOMAIN;
27-
2818
@Log
2919
@Configuration
3020
@RequiredArgsConstructor
@@ -38,15 +28,6 @@ public RabbitJacksonMessageConverter messageConverter(ObjectMapperSupplier objec
3828
return new RabbitJacksonMessageConverter(objectMapperSupplier.get());
3929
}
4030

41-
@Bean
42-
@ConditionalOnMissingBean(DynamicRegistry.class)
43-
public DynamicRegistry dynamicRegistry(AsyncPropsDomain asyncPropsDomain, DomainHandlers handlers) {
44-
AsyncProps props = asyncPropsDomain.getProps(DEFAULT_DOMAIN);
45-
TopologyCreator topologyCreator = RabbitMQSetupUtils.createTopologyCreator(props);
46-
IBrokerConfigProps brokerConfigProps = new BrokerConfigProps(asyncPropsDomain.getProps(DEFAULT_DOMAIN));
47-
return new DynamicRegistryImp(handlers.get(DEFAULT_DOMAIN), topologyCreator, brokerConfigProps);
48-
}
49-
5031
@Bean
5132
@ConditionalOnMissingBean(AsyncPropsDomain.RabbitSecretFiller.class)
5233
public AsyncPropsDomain.RabbitSecretFiller defaultRabbitSecretFiller() {
@@ -56,7 +37,8 @@ public AsyncPropsDomain.RabbitSecretFiller defaultRabbitSecretFiller() {
5637

5738
@Bean
5839
@ConditionalOnMissingBean(RabbitProperties.class)
59-
public RabbitProperties defaultRabbitProperties(RabbitPropertiesAutoConfig properties, ObjectMapperSupplier supplier) {
40+
public RabbitProperties defaultRabbitProperties(RabbitPropertiesAutoConfig properties,
41+
ObjectMapperSupplier supplier) {
6042
return supplier.get().convertValue(properties, RabbitProperties.class);
6143
}
6244

‎starters/async-rabbit-starter/src/main/java/org/reactivecommons/async/starter/impl/listener/rabbit/RabbitMQListenerOnlyConfig.java‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
package org.reactivecommons.async.starter.impl.listener.rabbit;
2+
3+
import org.reactivecommons.async.api.DynamicRegistry;
4+
import org.reactivecommons.async.commons.config.IBrokerConfigProps;
5+
import org.reactivecommons.async.rabbit.DynamicRegistryImp;
6+
import org.reactivecommons.async.rabbit.RabbitMQSetupUtils;
7+
import org.reactivecommons.async.rabbit.communications.TopologyCreator;
8+
import org.reactivecommons.async.rabbit.config.props.AsyncProps;
9+
import org.reactivecommons.async.rabbit.config.props.AsyncPropsDomain;
10+
import org.reactivecommons.async.rabbit.config.props.BrokerConfigProps;
11+
import org.reactivecommons.async.starter.config.DomainHandlers;
12+
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
13+
import org.springframework.context.annotation.Bean;
14+
import org.springframework.context.annotation.Configuration;
15+
16+
import static org.reactivecommons.async.api.HandlerRegistry.DEFAULT_DOMAIN;
17+
18+
@Configuration
19+
public class RabbitMQListenerOnlyConfig {
20+
21+
@Bean
22+
@ConditionalOnMissingBean(DynamicRegistry.class)
23+
public DynamicRegistry dynamicRegistry(AsyncPropsDomain asyncPropsDomain, DomainHandlers handlers) {
24+
AsyncProps props = asyncPropsDomain.getProps(DEFAULT_DOMAIN);
25+
TopologyCreator topologyCreator = RabbitMQSetupUtils.createTopologyCreator(props);
26+
IBrokerConfigProps brokerConfigProps = new BrokerConfigProps(asyncPropsDomain.getProps(DEFAULT_DOMAIN));
27+
return new DynamicRegistryImp(handlers.get(DEFAULT_DOMAIN), topologyCreator, brokerConfigProps);
28+
}
29+
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.reactivecommons.async.starter.impl.rabbit;
1+
package org.reactivecommons.async.starter.impl.common.rabbit;
22

33
import org.junit.jupiter.api.Test;
44
import org.reactivecommons.async.rabbit.RabbitMQBrokerProviderFactory;
@@ -7,6 +7,7 @@
77
import org.reactivecommons.async.starter.config.ConnectionManager;
88
import org.reactivecommons.async.starter.config.ReactiveCommonsConfig;
99
import org.reactivecommons.async.starter.config.ReactiveCommonsListenersConfig;
10+
import org.reactivecommons.async.starter.impl.common.rabbit.RabbitMQConfig;
1011
import org.springframework.beans.factory.annotation.Autowired;
1112
import org.springframework.boot.test.context.SpringBootTest;
1213

0 commit comments

Comments
 (0)