fix(handler): simplify handleRawCommand methods and improve RabbitMessage handling

Author: luisgomez29

async/async-commons-api/src/main/java/org/reactivecommons/async/api/HandlerRegistry.java

@@ -142,12 +142,12 @@ public HandlerRegistry handleCloudEventCommand(String domain, String commandName
     }
 
     // commands: RawMessage
-    public HandlerRegistry handleRawCommand(String commandName, RawCommandHandler<?> handler) {
-        return handleRawCommand(DEFAULT_DOMAIN, commandName, handler);
+    public HandlerRegistry handleRawCommand(RawCommandHandler<?> handler) {
+        return handleRawCommand(DEFAULT_DOMAIN, handler);
     }
 
-    public HandlerRegistry handleRawCommand(String domain, String commandName, RawCommandHandler<?> handler) {
-        commandHandlers.add(domain, new RegisteredCommandHandler<>(commandName, handler, RawMessage.class));
+    public HandlerRegistry handleRawCommand(String domain, RawCommandHandler<?> handler) {
+        commandHandlers.add(domain, new RegisteredCommandHandler<>("", handler, RawMessage.class));
         return this;
     }
 

async/async-commons-api/src/test/java/org/reactivecommons/async/api/HandlerRegistryTest.java

@@ -26,7 +26,6 @@
 class HandlerRegistryTest {
     private final HandlerRegistry registry = HandlerRegistry.register();
     private final String name = "some.event";
-    private final String nameRaw = "some.raw.event";
     private final String nameRawNotification = "some.raw.notification.event";
     private final String domain = "some-domain";
 
@@ -222,14 +221,14 @@ void handleCloudEventCommand() {
     void handleRawCommand() {
         SomeRawCommandEventHandler eventHandler = new SomeRawCommandEventHandler();
 
-        registry.handleRawCommand(nameRaw, eventHandler);
+        registry.handleRawCommand(eventHandler);
 
         assertThat(registry.getCommandHandlers().get(DEFAULT_DOMAIN))
                 .anySatisfy(registered -> assertThat(registered)
                         .extracting(RegisteredCommandHandler::path, RegisteredCommandHandler::inputClass,
                                 RegisteredCommandHandler::handler
                         )
-                        .containsExactly(nameRaw, RawMessage.class, eventHandler)).hasSize(1);
+                        .containsExactly("", RawMessage.class, eventHandler)).hasSize(1);
     }
 
     @Test

async/async-rabbit/src/main/java/org/reactivecommons/async/rabbit/RabbitMessage.java

@@ -23,7 +23,7 @@ public static class RabbitMessageProperties implements Properties {
     }
 
     public static RabbitMessage fromDelivery(Delivery delivery) {
-        return fromDelivery(delivery, null);
+        return fromDelivery(delivery, "");
     }
 
     public static RabbitMessage fromDelivery(Delivery delivery, String executorPath) {

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

@@ -5,6 +5,7 @@
 import lombok.extern.java.Log;
 import org.reactivecommons.async.api.handlers.CloudCommandHandler;
 import org.reactivecommons.async.api.handlers.DomainCommandHandler;
+import org.reactivecommons.async.api.handlers.RawCommandHandler;
 import org.reactivecommons.async.api.handlers.registered.RegisteredCommandHandler;
 import org.reactivecommons.async.commons.CommandExecutor;
 import org.reactivecommons.async.commons.DiscardNotifier;
@@ -128,7 +129,10 @@ protected String getExecutorPath(AcknowledgableDelivery msj) {
         if (jsonNode.get(COMMAND_ID) != null) {
             return jsonNode.get(NAME).asText();
         }
-        return jsonNode.get(TYPE).asText();
+        if (jsonNode.get(TYPE) != null) {
+            return jsonNode.get(TYPE).asText();
+        }
+        return rabbitMessage.getType();
     }
 
     @Override
@@ -142,6 +146,8 @@ private <T, D> Function<Message, Object> resolveConverter(RegisteredCommandHandl
             return msj -> messageConverter.readCommand(msj, commandClass);
         } else if (registeredCommandHandler.handler() instanceof CloudCommandHandler) {
             return messageConverter::readCloudEvent;
+        } else if (registeredCommandHandler.handler() instanceof RawCommandHandler) {
+            return message -> message;
         }
         throw new RuntimeException("Unknown handler type");
     }

docs/docs/reactive-commons/5-handler-registry.md

@@ -55,8 +55,8 @@ public class HandlerRegistry {
     public HandlerRegistry handleCloudEventCommand(String domain, String commandName, CloudCommandHandler handler)
 
     // commands: RawMessage
-    public HandlerRegistry handleRawCommand(String commandName, RawCommandHandler<?> handler)
-    public HandlerRegistry handleRawCommand(String domain, String commandName, RawCommandHandler<?> handler)
+    public HandlerRegistry handleRawCommand(RawCommandHandler<?> handler)
+    public HandlerRegistry handleRawCommand(String domain, RawCommandHandler<?> handler)
 
     // queries: Query
     public <T, R> HandlerRegistry serveQuery(String resource, QueryHandler<T, R> handler, Class<R> queryClass)