fix(dynamic-registry): move to respective listener bean dependency (#130)

* fix(error-reporter): Restore CustomReporter to default rabbit config

* fix(imports): Optimize imports

Author: juancgalvis

Diff for: acceptance/async-tests/src/test/java/org/reactivecommons/test/DirectGatewayPerfTest.java

@@ -3,8 +3,8 @@
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.reactivecommons.api.domain.Command;
-import org.reactivecommons.async.rabbit.RabbitDirectAsyncGateway;
 import org.reactivecommons.async.impl.config.annotations.EnableDirectAsyncGateway;
+import org.reactivecommons.async.rabbit.RabbitDirectAsyncGateway;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.SpringApplication;

Diff for: acceptance/async-tests/src/test/java/org/reactivecommons/test/DummyMessage.java

@@ -1,6 +1,7 @@
 package org.reactivecommons.test;
 
 import lombok.Data;
+
 import java.util.concurrent.ThreadLocalRandom;
 
 @Data

Diff for: acceptance/async-tests/src/test/java/org/reactivecommons/test/DynamicRegistryTest.java

@@ -5,7 +5,6 @@
 import org.reactivecommons.api.domain.DomainEventBus;
 import org.reactivecommons.async.api.DynamicRegistry;
 import org.reactivecommons.async.api.handlers.DomainEventHandler;
-import org.reactivecommons.async.api.handlers.EventHandler;
 import org.reactivecommons.async.impl.config.annotations.EnableDomainEventBus;
 import org.reactivecommons.async.impl.config.annotations.EnableMessageListeners;
 import org.reactivestreams.Publisher;

Diff for: acceptance/async-tests/src/test/java/org/reactivecommons/test/SimpleDirectCommunicationTest.java

@@ -5,7 +5,6 @@
 import org.reactivecommons.async.api.AsyncQuery;
 import org.reactivecommons.async.api.DirectAsyncGateway;
 import org.reactivecommons.async.api.HandlerRegistry;
-import org.reactivecommons.async.api.handlers.CommandHandler;
 import org.reactivecommons.async.api.handlers.DomainCommandHandler;
 import org.reactivecommons.async.impl.config.annotations.EnableDirectAsyncGateway;
 import org.reactivecommons.async.impl.config.annotations.EnableMessageListeners;
@@ -23,7 +22,8 @@
 import java.util.concurrent.ThreadLocalRandom;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static reactor.core.publisher.Mono.*;
+import static reactor.core.publisher.Mono.empty;
+import static reactor.core.publisher.Mono.just;
 
 @SpringBootTest
 class SimpleDirectCommunicationTest {

Diff for: acceptance/async-tests/src/test/java/org/reactivecommons/test/SimpleEventNotificationTest.java

@@ -5,7 +5,6 @@
 import org.reactivecommons.api.domain.DomainEventBus;
 import org.reactivecommons.async.api.HandlerRegistry;
 import org.reactivecommons.async.api.handlers.DomainEventHandler;
-import org.reactivecommons.async.api.handlers.EventHandler;
 import org.reactivecommons.async.impl.config.annotations.EnableDomainEventBus;
 import org.reactivecommons.async.impl.config.annotations.EnableMessageListeners;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,7 +18,9 @@
 import java.util.concurrent.ThreadLocalRandom;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static reactor.core.publisher.Mono.*;
+import static reactor.core.publisher.Mono.empty;
+import static reactor.core.publisher.Mono.from;
+import static reactor.core.publisher.Mono.just;
 
 @SpringBootTest
 class SimpleEventNotificationTest {

Diff for: acceptance/async-tests/src/test/java/org/reactivecommons/test/perf/BlockingCommandHandlePerfTest.java

@@ -4,7 +4,6 @@
 import org.reactivecommons.api.domain.Command;
 import org.reactivecommons.async.api.DirectAsyncGateway;
 import org.reactivecommons.async.api.HandlerRegistry;
-import org.reactivecommons.async.api.handlers.CommandHandler;
 import org.reactivecommons.async.api.handlers.DomainCommandHandler;
 import org.reactivecommons.async.impl.config.annotations.EnableDirectAsyncGateway;
 import org.reactivecommons.async.impl.config.annotations.EnableMessageListeners;
@@ -24,7 +23,7 @@
 
 import static java.lang.System.out;
 import static org.assertj.core.api.Assertions.assertThat;
-import static reactor.core.publisher.Mono.*;
+import static reactor.core.publisher.Mono.fromRunnable;
 
 @SpringBootTest
 class BlockingCommandHandlePerfTest {

Diff for: acceptance/async-tests/src/test/java/org/reactivecommons/test/perf/ParallelOnBlockingInSubscriptionTimeTest.java

@@ -5,7 +5,6 @@
 import org.reactivecommons.api.domain.Command;
 import org.reactivecommons.async.api.DirectAsyncGateway;
 import org.reactivecommons.async.api.HandlerRegistry;
-import org.reactivecommons.async.api.handlers.CommandHandler;
 import org.reactivecommons.async.api.handlers.DomainCommandHandler;
 import org.reactivecommons.async.impl.config.annotations.EnableDirectAsyncGateway;
 import org.reactivecommons.async.impl.config.annotations.EnableMessageListeners;

Diff for: acceptance/async-tests/src/test/java/org/reactivecommons/test/perf/SimpleCommandHandlePerfTest.java

@@ -5,7 +5,6 @@
 import org.reactivecommons.api.domain.Command;
 import org.reactivecommons.async.api.DirectAsyncGateway;
 import org.reactivecommons.async.api.HandlerRegistry;
-import org.reactivecommons.async.api.handlers.CommandHandler;
 import org.reactivecommons.async.api.handlers.DomainCommandHandler;
 import org.reactivecommons.async.impl.config.annotations.EnableDirectAsyncGateway;
 import org.reactivecommons.async.impl.config.annotations.EnableMessageListeners;

Diff for: async/async-commons-api/src/main/java/org/reactivecommons/async/api/DynamicRegistry.java

@@ -1,7 +1,6 @@
 package org.reactivecommons.async.api;
 
 import org.reactivecommons.async.api.handlers.DomainEventHandler;
-import org.reactivecommons.async.api.handlers.EventHandler;
 import org.reactivecommons.async.api.handlers.QueryHandler;
 import org.reactivecommons.async.api.handlers.QueryHandlerDelegate;
 import reactor.core.publisher.Mono;

Diff for: async/async-commons/src/main/java/org/reactivecommons/async/commons/converters/json/JacksonMessageConverter.java

@@ -3,7 +3,6 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.cloudevents.CloudEvent;
-import io.cloudevents.jackson.JsonFormat;
 import lombok.Data;
 import lombok.RequiredArgsConstructor;
 import org.reactivecommons.api.domain.Command;

Diff for: async/async-commons/src/test/java/org/reactivecommons/async/commons/utils/NameGeneratorTest.java

@@ -2,7 +2,9 @@
 
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 class NameGeneratorTest {
 

Diff for: async/async-commons/src/test/java/org/reactivecommons/async/commons/utils/matcher/KeyMatcherPerformanceManualTest.java

@@ -8,7 +8,12 @@
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Paths;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 class KeyMatcherPerformanceManualTest {

Diff for: async/async-kafka/src/main/java/org/reactivecommons/async/kafka/listeners/ApplicationNotificationsListener.java

@@ -14,7 +14,6 @@
 import reactor.core.publisher.Mono;
 import reactor.kafka.receiver.ReceiverRecord;
 
-import java.util.Optional;
 import java.util.UUID;
 import java.util.function.Function;
 

Diff for: async/async-kafka/src/test/java/org/reactivecommons/async/kafka/communications/topology/KafkaCustomizationsTest.java

@@ -2,8 +2,6 @@
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.reactivecommons.async.kafka.communications.topology.KafkaCustomizations;
-import org.reactivecommons.async.kafka.communications.topology.TopicCustomization;
 
 import java.util.HashMap;
 import java.util.Map;

Diff for: async/async-kafka/src/test/java/org/reactivecommons/async/kafka/listeners/GenericMessageListenerTest.java

@@ -15,7 +15,6 @@
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 import reactor.core.publisher.MonoSink;
-import reactor.kafka.receiver.ReceiverOffset;
 import reactor.kafka.receiver.ReceiverRecord;
 import reactor.test.StepVerifier;
 
@@ -26,7 +25,6 @@
 
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.Mockito.atLeastOnce;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;

Diff for: async/async-rabbit/src/main/java/org/reactivecommons/async/rabbit/DynamicRegistryImp.java

@@ -4,7 +4,6 @@
 import lombok.RequiredArgsConstructor;
 import org.reactivecommons.async.api.DynamicRegistry;
 import org.reactivecommons.async.api.handlers.DomainEventHandler;
-import org.reactivecommons.async.api.handlers.EventHandler;
 import org.reactivecommons.async.api.handlers.QueryHandler;
 import org.reactivecommons.async.api.handlers.QueryHandlerDelegate;
 import org.reactivecommons.async.api.handlers.registered.RegisteredEventListener;
@@ -33,7 +32,8 @@ public <T> Mono<Void> listenEvent(String eventName, DomainEventHandler<T> fn, Cl
 
     @Override
     public <T, R> void serveQuery(String resource, QueryHandler<T, R> handler, Class<R> queryClass) {
-        resolver.addQueryHandler(new RegisteredQueryHandler<>(resource, (ignored, message) -> handler.handle(message), queryClass));
+        resolver.addQueryHandler(new RegisteredQueryHandler<>(resource, (ignored, message) -> handler.handle(message)
+                , queryClass));
     }
 
     @Override

Diff for: async/async-rabbit/src/main/java/org/reactivecommons/async/rabbit/listeners/ApplicationCommandListener.java

@@ -8,10 +8,10 @@
 import org.reactivecommons.async.api.handlers.registered.RegisteredCommandHandler;
 import org.reactivecommons.async.commons.CommandExecutor;
 import org.reactivecommons.async.commons.DiscardNotifier;
+import org.reactivecommons.async.commons.HandlerResolver;
 import org.reactivecommons.async.commons.communications.Message;
 import org.reactivecommons.async.commons.converters.MessageConverter;
 import org.reactivecommons.async.commons.ext.CustomReporter;
-import org.reactivecommons.async.commons.HandlerResolver;
 import org.reactivecommons.async.rabbit.RabbitMessage;
 import org.reactivecommons.async.rabbit.communications.ReactiveMessageListener;
 import org.reactivecommons.async.rabbit.communications.TopologyCreator;

Diff for: async/async-rabbit/src/test/java/org/reactivecommons/async/helpers/TestStubs.java

@@ -1,9 +1,11 @@
 package org.reactivecommons.async.helpers;
 
-import org.reactivecommons.async.rabbit.RabbitMessage;
 import org.reactivecommons.async.commons.communications.Message;
+import org.reactivecommons.async.rabbit.RabbitMessage;
 
-import static org.reactivecommons.async.commons.Headers.*;
+import static org.reactivecommons.async.commons.Headers.CORRELATION_ID;
+import static org.reactivecommons.async.commons.Headers.REPLY_ID;
+import static org.reactivecommons.async.commons.Headers.SERVED_QUERY_ID;
 
 public class TestStubs {
 

Diff for: async/async-rabbit/src/test/java/org/reactivecommons/async/rabbit/DynamicRegistryImpTest.java

@@ -23,7 +23,10 @@
 import java.util.concurrent.ConcurrentHashMap;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 import static reactor.core.publisher.Mono.just;
 
 

Diff for: async/async-rabbit/src/test/java/org/reactivecommons/async/rabbit/QueryExecutorTest.java

@@ -8,10 +8,10 @@
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.reactivecommons.async.api.From;
 import org.reactivecommons.async.api.handlers.QueryHandlerDelegate;
+import org.reactivecommons.async.commons.QueryExecutor;
+import org.reactivecommons.async.commons.communications.Message;
 import org.reactivecommons.async.helpers.SampleClass;
 import org.reactivecommons.async.helpers.TestStubs;
-import org.reactivecommons.async.commons.communications.Message;
-import org.reactivecommons.async.commons.QueryExecutor;
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 

Diff for: async/async-rabbit/src/test/java/org/reactivecommons/async/rabbit/RabbitMessageTest.java

@@ -4,7 +4,6 @@
 import com.rabbitmq.client.Delivery;
 import com.rabbitmq.client.Envelope;
 import org.junit.jupiter.api.Test;
-import org.reactivecommons.async.rabbit.RabbitMessage;
 
 import java.util.HashMap;
 import java.util.Map;

Diff for: async/async-rabbit/src/test/java/org/reactivecommons/async/rabbit/listeners/GenericMessageListenerPerfTest.java

@@ -2,7 +2,24 @@
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.rabbitmq.client.*;
+import com.rabbitmq.client.AMQP;
+import com.rabbitmq.client.BuiltinExchangeType;
+import com.rabbitmq.client.CancelCallback;
+import com.rabbitmq.client.Channel;
+import com.rabbitmq.client.ConfirmCallback;
+import com.rabbitmq.client.ConfirmListener;
+import com.rabbitmq.client.Connection;
+import com.rabbitmq.client.Consumer;
+import com.rabbitmq.client.ConsumerShutdownSignalCallback;
+import com.rabbitmq.client.DeliverCallback;
+import com.rabbitmq.client.Delivery;
+import com.rabbitmq.client.Envelope;
+import com.rabbitmq.client.GetResponse;
+import com.rabbitmq.client.Method;
+import com.rabbitmq.client.ReturnCallback;
+import com.rabbitmq.client.ReturnListener;
+import com.rabbitmq.client.ShutdownListener;
+import com.rabbitmq.client.ShutdownSignalException;
 import lombok.Data;
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
@@ -12,11 +29,11 @@
 import org.mockito.Mockito;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.reactivecommons.api.domain.Command;
-import org.reactivecommons.async.commons.communications.Message;
 import org.reactivecommons.async.commons.DiscardNotifier;
+import org.reactivecommons.async.commons.communications.Message;
+import org.reactivecommons.async.commons.ext.CustomReporter;
 import org.reactivecommons.async.rabbit.communications.ReactiveMessageListener;
 import org.reactivecommons.async.rabbit.communications.TopologyCreator;
-import org.reactivecommons.async.commons.ext.CustomReporter;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 import reactor.rabbitmq.AcknowledgableDelivery;

Diff for: samples/async/async-kafka-sender-client/src/main/java/sample/SampleRestController.java

@@ -2,14 +2,12 @@
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import io.cloudevents.CloudEvent;
-import io.cloudevents.CloudEventData;
 import io.cloudevents.core.builder.CloudEventBuilder;
 import io.cloudevents.jackson.JsonCloudEventData;
 import lombok.Data;
 import lombok.RequiredArgsConstructor;
 import org.reactivecommons.api.domain.DomainEvent;
 import org.reactivecommons.api.domain.DomainEventBus;
-import org.reactivecommons.async.commons.converters.json.CloudEventBuilderExt;
 import org.reactivecommons.async.commons.converters.json.ObjectMapperSupplier;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.RestController;

Diff for: samples/async/async-receiver-responder/src/main/java/sample/HandlersConfig.java

@@ -4,7 +4,6 @@
 import org.reactivecommons.async.api.DynamicRegistry;
 import org.reactivecommons.async.api.HandlerRegistry;
 import org.reactivecommons.async.api.handlers.DomainEventHandler;
-import org.reactivecommons.async.api.handlers.EventHandler;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

Diff for: samples/async/async-sender-client/src/main/java/sample/SampleRestController.java

@@ -1,6 +1,5 @@
 package sample;
 
-import io.cloudevents.CloudEvent;
 import lombok.RequiredArgsConstructor;
 import org.reactivecommons.api.domain.Command;
 import org.reactivecommons.api.domain.DomainEvent;
@@ -23,8 +22,6 @@
 import sample.model.broker.AnimalEvent;
 import sample.model.broker.RemovedMemberEvent;
 
-import java.net.URI;
-import java.time.OffsetDateTime;
 import java.util.UUID;
 
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;

Diff for: starters/async-commons-starter/src/main/java/org/reactivecommons/async/starter/config/ReactiveCommonsConfig.java

@@ -8,6 +8,8 @@
 import org.reactivecommons.async.commons.config.BrokerConfig;
 import org.reactivecommons.async.commons.converters.json.DefaultObjectMapperSupplier;
 import org.reactivecommons.async.commons.converters.json.ObjectMapperSupplier;
+import org.reactivecommons.async.commons.ext.CustomReporter;
+import org.reactivecommons.async.commons.ext.DefaultCustomReporter;
 import org.reactivecommons.async.commons.reply.ReactiveReplyRouter;
 import org.reactivecommons.async.starter.broker.BrokerProvider;
 import org.reactivecommons.async.starter.broker.BrokerProviderFactory;
@@ -30,7 +32,7 @@
 @Configuration
 @RequiredArgsConstructor
 @Import(ReactiveCommonsHealthConfig.class)
-@ComponentScan("org.reactivecommons.async.starter.impl")
+@ComponentScan("org.reactivecommons.async.starter.impl.common")
 public class ReactiveCommonsConfig {
 
     @Bean
@@ -89,4 +91,10 @@ public MeterRegistry defaultRabbitMeterRegistry() {
         return new SimpleMeterRegistry();
     }
 
+    @Bean
+    @ConditionalOnMissingBean
+    public CustomReporter reactiveCommonsCustomErrorReporter() {
+        return new DefaultCustomReporter();
+    }
+
 }

Diff for: starters/async-commons-starter/src/main/java/org/reactivecommons/async/starter/config/ReactiveCommonsListenersConfig.java

@@ -7,12 +7,11 @@
 import org.reactivecommons.async.api.HandlerRegistry;
 import org.reactivecommons.async.commons.HandlerResolver;
 import org.reactivecommons.async.commons.HandlerResolverBuilder;
-import org.reactivecommons.async.commons.ext.CustomReporter;
-import org.reactivecommons.async.commons.ext.DefaultCustomReporter;
 import org.reactivecommons.async.starter.props.GenericAsyncPropsDomain;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import reactor.core.publisher.Mono;
 
@@ -21,6 +20,7 @@
 @Log
 @Configuration
 @RequiredArgsConstructor
+@ComponentScan("org.reactivecommons.async.starter.impl.listener")
 public class ReactiveCommonsListenersConfig {
 
     @Bean
@@ -41,12 +41,6 @@ public DomainHandlers buildHandlers(ApplicationContext context,
         return handlers;
     }
 
-    @Bean
-    @ConditionalOnMissingBean
-    public CustomReporter reactiveCommonsCustomErrorReporter() {
-        return new DefaultCustomReporter();
-    }
-
     @Bean
     @ConditionalOnMissingBean
     @SuppressWarnings("rawtypes")

Diff for: starters/async-commons-starter/src/main/java/org/reactivecommons/async/starter/listeners/EventsListenerConfig.java

@@ -2,8 +2,8 @@
 
 
 import org.reactivecommons.async.commons.HandlerResolver;
-import org.reactivecommons.async.starter.config.ConnectionManager;
 import org.reactivecommons.async.starter.broker.BrokerProvider;
+import org.reactivecommons.async.starter.config.ConnectionManager;
 import org.reactivecommons.async.starter.config.DomainHandlers;
 import org.reactivecommons.async.starter.config.ReactiveCommonsConfig;
 import org.reactivecommons.async.starter.config.ReactiveCommonsListenersConfig;