Add type inference support for queries

Fixes: gh-5

Author: Daniel Bustamante Ospina

async/async-commons-starter/src/main/java/org/reactivecommons/async/impl/config/MessageListenersConfig.java

@@ -6,6 +6,7 @@
 import org.reactivecommons.async.api.handlers.QueryHandler;
 import org.reactivecommons.async.api.handlers.registered.RegisteredCommandHandler;
 import org.reactivecommons.async.api.handlers.registered.RegisteredEventListener;
+import org.reactivecommons.async.api.handlers.registered.RegisteredQueryHandler;
 import org.reactivecommons.async.impl.HandlerResolver;
 import org.reactivecommons.async.impl.communications.ReactiveMessageListener;
 import org.reactivecommons.async.impl.communications.ReactiveMessageSender;
@@ -63,10 +64,10 @@ public ApplicationCommandListener applicationCommandListener(ReactiveMessageList
     public HandlerResolver resolver(ApplicationContext context, DefaultQueryHandler defaultHandler, Environment env, DefaultCommandHandler defaultCommandHandler) {
         final Map<String, HandlerRegistry> registries = context.getBeansOfType(HandlerRegistry.class);
 
-        final ConcurrentHashMap<String, QueryHandler<?, ?>> handlers = registries
+        final ConcurrentHashMap<String, RegisteredQueryHandler> handlers = registries
             .values().stream()
             .flatMap(r -> r.getHandlers().stream())
-            .collect(ConcurrentHashMap::new, (map, handler) -> map.put(handler.getPath(), handler.getHandler()),
+            .collect(ConcurrentHashMap::new, (map, handler) -> map.put(handler.getPath(), handler),
                 ConcurrentHashMap::putAll);
 
         final Map<String, RegisteredEventListener> eventListeners = registries
@@ -82,21 +83,6 @@ public HandlerResolver resolver(ApplicationContext context, DefaultQueryHandler
                 ConcurrentHashMap::putAll);
 
         return new HandlerResolver(handlers, eventListeners, commandHandlers) {
-            @Override
-            @SuppressWarnings("unchecked")
-            public QueryHandler<?, ?> getQueryHandler(String path) {
-                final QueryHandler<?, ?> handler = super.getQueryHandler(path);
-                if (handler == null) {
-                    try {
-                        final String handlerName = env.getProperty(path);
-                        return context.getBean(handlerName, QueryHandler.class);
-                    } catch (Exception e) {
-                        return defaultHandler;
-                    }
-                }
-                return handler;
-            }
-
             @Override
             @SuppressWarnings("unchecked")
             public <T> RegisteredCommandHandler<T> getCommandHandler(String path) {

async/async-commons/src/main/java/org/reactivecommons/async/impl/HandlerResolver.java

@@ -4,21 +4,22 @@
 import org.reactivecommons.async.api.handlers.QueryHandler;
 import org.reactivecommons.async.api.handlers.registered.RegisteredCommandHandler;
 import org.reactivecommons.async.api.handlers.registered.RegisteredEventListener;
+import org.reactivecommons.async.api.handlers.registered.RegisteredQueryHandler;
 
 import java.util.Collection;
 import java.util.Map;
 
 @RequiredArgsConstructor
 public class HandlerResolver {
 
-    private final Map<String, QueryHandler<?, ?>> queryHandlers;
+    private final Map<String, RegisteredQueryHandler> queryHandlers;
     private final Map<String, RegisteredEventListener> eventListeners;
     private final Map<String, RegisteredCommandHandler> commandHandlers;
 
 
     @SuppressWarnings("unchecked")
-    public <T, R> QueryHandler<T, R> getQueryHandler(String path) {
-        return (QueryHandler<T, R>) queryHandlers.get(path);
+    public <T, R> RegisteredQueryHandler<T, R> getQueryHandler(String path) {
+        return (RegisteredQueryHandler<T, R>) queryHandlers.get(path);
     }
 
     @SuppressWarnings("unchecked")

async/async-commons/src/main/java/org/reactivecommons/async/impl/listeners/ApplicationQueryListener.java

@@ -3,6 +3,7 @@
 import com.rabbitmq.client.AMQP;
 import lombok.extern.java.Log;
 import org.reactivecommons.async.api.handlers.QueryHandler;
+import org.reactivecommons.async.api.handlers.registered.RegisteredQueryHandler;
 import org.reactivecommons.async.impl.HandlerResolver;
 import org.reactivecommons.async.impl.Headers;
 import org.reactivecommons.async.impl.QueryExecutor;
@@ -26,6 +27,7 @@
 import static org.reactivecommons.async.impl.Headers.*;
 
 @Log
+//TODO: Organizar inferencia de tipos de la misma forma que en comandos y eventos
 public class ApplicationQueryListener extends GenericMessageListener {
 
 
@@ -48,11 +50,10 @@ public ApplicationQueryListener(ReactiveMessageListener listener, String queueNa
 
     @Override
     protected Function<Message, Mono<Object>> rawMessageHandler(String executorPath) {
-        final QueryHandler<Object, Object> handler1 = handlerResolver.getQueryHandler(executorPath);
-        ParameterizedType genericSuperclass = (ParameterizedType) handler1.getClass().getGenericInterfaces()[0];
-        final Class<?> handlerClass = (Class<?>) genericSuperclass.getActualTypeArguments()[1];
+        final RegisteredQueryHandler<Object, Object> handler1 = handlerResolver.getQueryHandler(executorPath);
+        final Class<?> handlerClass = (Class<?>) handler1.getQueryClass();
         Function<Message, Object> messageConverter = msj -> converter.readAsyncQuery(msj, handlerClass).getQueryData();
-        final QueryExecutor<Object, Object> executor = new QueryExecutor<>(handler1, messageConverter);
+        final QueryExecutor executor = new QueryExecutor(handler1.getHandler(), messageConverter);
         return executor::execute;
     }