alias named events even if they are not in annotation finder scope

Author: jlabedo

packages/Ecotone/src/Messaging/Config/Annotation/ModuleConfiguration/AsynchronousModule.php

@@ -255,7 +255,7 @@ public function resolveChannels(array $extensionObjects): array
         return $endpointChannels;
     }
 
-    public function handleRoutingEvent(RoutingEvent $event, ?Configuration $messagingConfiguration = null): void
+    public function handleRoutingEvent(RoutingEvent $event): void
     {
         $registration = $event->getRegistration();
         $isAsynchronous = $registration->hasMethodAnnotation(Asynchronous::class);

packages/Ecotone/src/Modelling/Config/AggregrateModule.php

@@ -496,14 +496,16 @@ public function registerBusinessRepositories(InterfaceToCallRegistry $interfaceT
         }
     }
 
-    public function handleRoutingEvent(RoutingEvent $event, ?Configuration $messagingConfiguration = null): void
+    public function handleRoutingEvent(RoutingEvent $event): void
     {
         $registration = $event->getRegistration();
 
         if (! $registration->hasAnnotation(Aggregate::class)) {
             return;
         }
 
+        $messagingConfiguration = $event->getBusRoutingMapBuilder()->getMessagingConfiguration();
+
         Assert::notNull($messagingConfiguration, 'RoutingEvent should be handled with messaging configuration, but it is null. Did you forget to pass it?');
 
         if ($registration->isMagicMethod()) {

packages/Ecotone/src/Modelling/Config/Routing/BusRoutingMapBuilder.php

@@ -7,6 +7,9 @@
 
 namespace Ecotone\Modelling\Config\Routing;
 
+use Ecotone\Messaging\Handler\Type;
+use Ecotone\Messaging\Handler\TypeDescriptor;
+use Ecotone\Modelling\Attribute\NamedEvent;
 use function array_map;
 use function array_unique;
 
@@ -49,19 +52,15 @@ public function getRoutesFromAnnotatedFinding(AnnotatedFinding $registration, In
             return [$routingKey];
         }
 
-        $interfaceToCall = $interfaceToCallRegistry->getFor($registration->getClassName(), $registration->getMethodName());
-        if ($interfaceToCall->hasNoParameters()) {
+        $type = $this->getFirstParameterType($interfaceToCallRegistry, $registration);
+        if (!$type) {
             return [];
-        }
-        $type = $interfaceToCall->getFirstParameter()->getTypeDescriptor();
-        if ($type->isUnionType()) {
+        } else {
             $routes = [];
             foreach ($type->getUnionTypes() as $unionType) {
                 $routes[] = (string) $unionType;
             }
             return $routes;
-        } else {
-            return [(string) $type];
         }
     }
 
@@ -76,9 +75,36 @@ public function addRoutesFromAnnotatedFinding(AnnotatedFinding $registration, In
         $routes = $this->getRoutesFromAnnotatedFinding($registration, $interfaceToCallRegistry);
         $priority = PriorityBasedOnType::fromAnnotatedFinding($registration);
 
-        $routingEvent = new RoutingEvent($registration, $destinationChannel, $routes, $priority->getPriorityArray());
+        $routingEvent = new RoutingEvent($this, $registration, $destinationChannel, $routes, $priority->getPriorityArray());
+
+        $this->dispatchRoutingEvent($routingEvent);
+
+        if ($routingEvent->isCanceled()) {
+            return null; // event is canceled, no routing
+        }
+        $destinationChannel = $routingEvent->getDestinationChannel();
+        $priority = $routingEvent->getPriority();
+
+        foreach ($routingEvent->getRoutingKeys() as $routingKey) {
+            $this->addRoute($routingKey, $destinationChannel, $priority);
+        }
+
+        // add object alias if the routing key is a class and has a NamedEvent annotation
+        $type = $this->getFirstParameterType($interfaceToCallRegistry, $registration);
+        if ($type) {
+            foreach ($type->getUnionTypes() as $unionType) {
+                $className = (string) $unionType;
+                if (class_exists($className)) {
+                    $classDefinition = $interfaceToCallRegistry->getClassDefinitionFor(TypeDescriptor::create($className));
+                    if ($classDefinition->hasClassAnnotation(TypeDescriptor::create(NamedEvent::class))) {
+                        $namedEvent = $classDefinition->getSingleClassAnnotation(TypeDescriptor::create(NamedEvent::class));
+                        $this->addObjectAlias($className, $namedEvent->getName());
+                    }
+                }
+            }
+        }
 
-        return $this->dispatchRoutingEvent($routingEvent);
+        return $destinationChannel;
     }
 
     /**
@@ -166,6 +192,9 @@ public function addNamedRoute(string $routeName, string $channel, int|array $pri
     public function addObjectAlias(string $class, string $routingKey): void
     {
         if (isset($this->classToNameAliases[$class])) {
+            if ($this->classToNameAliases[$class] === $routingKey) {
+                return; // already registered
+            }
             throw ConfigurationException::create("Class $class already has an alias registered: " . $this->classToNameAliases[$class]);
         }
         if (isset($this->nameToClassAliases[$routingKey])) {
@@ -243,6 +272,11 @@ public function compile(): Definition
         ]);
     }
 
+    public function getMessagingConfiguration(): ?Configuration
+    {
+        return $this->messagingConfiguration;
+    }
+
     private function channelName(string $channel): string
     {
         if (isset($this->channelsName[$channel])) {
@@ -263,25 +297,22 @@ private function uniqueRoutedChannels(array $routes): array
     /**
      * @return ?string the destination channel name or null if the event is canceled
      */
-    private function dispatchRoutingEvent(RoutingEvent $routingEvent): ?string
+    private function dispatchRoutingEvent(RoutingEvent $routingEvent): void
     {
         foreach ($this->routingEventHandlers as $routingEventHandler) {
-            $routingEventHandler->handleRoutingEvent($routingEvent, $this->messagingConfiguration);
-            if ($routingEvent->isCanceled()) {
-                return null;
-            }
-            if ($routingEvent->isPropagationStopped()) {
-                break;
+            $routingEventHandler->handleRoutingEvent($routingEvent);
+            if ($routingEvent->isCanceled() || $routingEvent->isPropagationStopped()) {
+                return;
             }
         }
+    }
 
-        $destinationChannel = $routingEvent->getDestinationChannel();
-        $priority = $routingEvent->getPriority();
-
-        foreach ($routingEvent->getRoutingKeys() as $routingKey) {
-            $this->addRoute($routingKey, $destinationChannel, $priority);
+    private function getFirstParameterType(InterfaceToCallRegistry $interfaceToCallRegistry, AnnotatedFinding $registration): ?Type
+    {
+        $interfaceToCall = $interfaceToCallRegistry->getFor($registration->getClassName(), $registration->getMethodName());
+        if ($interfaceToCall->hasNoParameters()) {
+            return null;
         }
-
-        return $destinationChannel;
+        return $interfaceToCall->getFirstParameter()->getTypeDescriptor();
     }
 }

packages/Ecotone/src/Modelling/Config/Routing/RoutingEvent.php

@@ -19,6 +19,7 @@ class RoutingEvent
      * @param int|int[] $priority
      */
     public function __construct(
+        private BusRoutingMapBuilder $busRoutingMapBuilder,
         private readonly AnnotatedFinding $registration,
         private string $destinationChannel,
         private array $routingKeys,
@@ -83,4 +84,9 @@ public function stopPropagation(): void
     {
         $this->isPropagationStopped = true;
     }
+
+    public function getBusRoutingMapBuilder(): BusRoutingMapBuilder
+    {
+        return $this->busRoutingMapBuilder;
+    }
 }

packages/Ecotone/src/Modelling/Config/Routing/RoutingEventHandler.php

@@ -7,9 +7,7 @@
 
 namespace Ecotone\Modelling\Config\Routing;
 
-use Ecotone\Messaging\Config\Configuration;
-
 interface RoutingEventHandler
 {
-    public function handleRoutingEvent(RoutingEvent $event, ?Configuration $messagingConfiguration = null): void;
+    public function handleRoutingEvent(RoutingEvent $event): void;
 }

packages/Ecotone/src/Modelling/Config/ServiceHandlerModule.php

@@ -62,7 +62,7 @@ public function prepare(Configuration $messagingConfiguration, array $moduleExte
     {
     }
 
-    public function handleRoutingEvent(RoutingEvent $event, ?Configuration $messagingConfiguration = null): void
+    public function handleRoutingEvent(RoutingEvent $event): void
     {
         $registration = $event->getRegistration();
         if ($registration->hasClassAnnotation(Aggregate::class)) {
@@ -80,7 +80,7 @@ public function handleRoutingEvent(RoutingEvent $event, ?Configuration $messagin
             ? TransformerBuilder::create(AnnotatedDefinitionReference::getReferenceFor($registration), $this->interfaceToCallRegistry->getFor($registration->getClassName(), $registration->getMethodName()))
             : ServiceActivatorBuilder::create(AnnotatedDefinitionReference::getReferenceFor($registration), $this->interfaceToCallRegistry->getFor($registration->getClassName(), $registration->getMethodName()));
 
-        $messagingConfiguration->registerMessageHandler(
+        $event->getBusRoutingMapBuilder()->getMessagingConfiguration()->registerMessageHandler(
             $handler
                 ->withInputChannelName($event->getDestinationChannel())
                 ->withOutputMessageChannel($methodAnnotation->getOutputChannelName())

packages/PdoEventSourcing/src/Config/EventSourcingModuleRoutingExtension.php

@@ -8,7 +8,6 @@
 namespace Ecotone\EventSourcing\Config;
 
 use Ecotone\EventSourcing\Attribute\Projection;
-use Ecotone\Messaging\Config\Configuration;
 use Ecotone\Modelling\Attribute\CommandHandler;
 use Ecotone\Modelling\Attribute\EventHandler;
 use Ecotone\Modelling\Config\Routing\RoutingEvent;
@@ -26,7 +25,7 @@ public function __construct(private array $pollingProjectionNames)
     {
     }
 
-    public function handleRoutingEvent(RoutingEvent $event, ?Configuration $messagingConfiguration = null): void
+    public function handleRoutingEvent(RoutingEvent $event): void
     {
         $registration = $event->getRegistration();
         $isCommandOrEventHandler = $registration->hasAnnotation(CommandHandler::class) || $registration->hasAnnotation(EventHandler::class);