Update service definitions for refactored resolvers

Author: Jeroen de Graaf

config/services.yaml

@@ -5,15 +5,15 @@ services:
   Gember\EventSourcing\EventStore\EventStore:
     class: Gember\EventSourcing\EventStore\Rdbms\RdbmsEventStore
     arguments:
-      - '@gember.event_sourcing.resolver.domain_event.normalized_event_name.normalized_event_name_resolver'
+      - '@gember.event_sourcing.resolver.domain_event.domain_event_resolver'
       - '@gember.event_sourcing.event_store.rdbms.rdbms_domain_event_envelope_factory'
       - '@gember.event_sourcing.event_store.rdbms.rdbms_event_factory'
       - '@gember.event_sourcing.event_store.rdbms.rdbms_event_store_repository'
 
   gember.event_sourcing.event_store.domain_event_envelope_factory:
     class: Gember\EventSourcing\EventStore\DomainEventEnvelopeFactory
     arguments:
-      - '@gember.event_sourcing.resolver.domain_message.domain_tags.domain_tags_resolver'
+      - '@gember.event_sourcing.resolver.domain_event.domain_event_resolver'
       - '@gember.event_sourcing.util.generator.identity.identity_generator'
       - '@gember.event_sourcing.util.time.clock.clock'
 
@@ -26,7 +26,7 @@ services:
   gember.event_sourcing.event_store.rdbms.rdbms_event_factory:
     class: Gember\EventSourcing\EventStore\Rdbms\RdbmsEventFactory
     arguments:
-      - '@gember.event_sourcing.resolver.domain_event.normalized_event_name.normalized_event_name_resolver'
+      - '@gember.event_sourcing.resolver.domain_event.domain_event_resolver'
       - '@gember.event_sourcing.util.serialization.serializer.serializer'
 
   gember.event_sourcing.event_store.rdbms.rdbms_event_store_repository:
@@ -61,7 +61,7 @@ services:
     arguments:
       - '@gember.event_sourcing.util.file.finder.finder'
       - '@gember.event_sourcing.util.file.reflector.reflector'
-      - '@gember.event_sourcing.resolver.domain_event.normalized_event_name.normalized_event_name_resolver'
+      - '@gember.event_sourcing.resolver.domain_event.domain_event_resolver'
 
   gember.event_sourcing.registry.event.cached.cached_event_registry_decorator:
     class: Gember\EventSourcing\Registry\Event\Cached\CachedEventRegistryDecorator
@@ -95,7 +95,7 @@ services:
     arguments:
       - '@gember.event_sourcing.repository.use_case_repository'
       - '@gember.event_sourcing.registry.command_handler.command_handler_registry'
-      - '@gember.event_sourcing.resolver.domain_message.domain_tags.domain_tags_resolver'
+      - '@gember.event_sourcing.resolver.domain_event.domain_event_resolver'
 
   gember.event_sourcing.repository.use_case_repository:
     class: Gember\EventSourcing\Repository\EventSourced\EventSourcedUseCaseRepository
@@ -122,55 +122,9 @@ services:
     arguments:
       - '@gember.event_sourcing.util.attribute.resolver.attribute_resolver'
 
-  gember.event_sourcing.resolver.domain_message.domain_tags.domain_tags_resolver:
-    class: Gember\EventSourcing\Resolver\DomainMessage\DomainTags\Stacked\StackedDomainTagsResolver
-    arguments:
-      - [
-        '@gember.event_sourcing.resolver.domain_message.domain_tags.attribute.attribute_domain_tags_resolver',
-        '@gember.event_sourcing.resolver.domain_message.domain_tags.interface.interface_domain_tags_resolver'
-      ]
-
-  gember.event_sourcing.resolver.domain_message.domain_tags.attribute.attribute_domain_tags_resolver:
-    class: Gember\EventSourcing\Resolver\DomainMessage\DomainTags\Attribute\AttributeDomainTagsResolver
-    arguments:
-      - '@gember.event_sourcing.util.attribute.resolver.attribute_resolver'
-
-  gember.event_sourcing.resolver.domain_message.domain_tags.interface.interface_domain_tags_resolver:
-    class: Gember\EventSourcing\Resolver\DomainMessage\DomainTags\Interface\InterfaceDomainTagsResolver
-
-  gember.event_sourcing.resolver.domain_event.normalized_event_name.normalized_event_name_resolver:
-    class: Gember\EventSourcing\Resolver\DomainEvent\NormalizedEventName\Stacked\StackedNormalizedEventNameResolver
-    arguments:
-      - [
-        '@gember.event_sourcing.resolver.domain_event.normalized_event_name.attribute.attribute_normalized_event_name_resolver',
-        '@gember.event_sourcing.resolver.domain_event.normalized_event_name.interface.interface_normalized_event_name_resolver',
-        '@gember.event_sourcing.resolver.domain_event.normalized_event_name.class_name.class_name_normalized_event_name_resolver'
-      ]
-
-  gember.event_sourcing.resolver.domain_event.normalized_event_name.attribute.attribute_normalized_event_name_resolver:
-    class: Gember\EventSourcing\Resolver\DomainEvent\NormalizedEventName\Attribute\AttributeNormalizedEventNameResolver
-    arguments:
-      - '@gember.event_sourcing.util.attribute.resolver.attribute_resolver'
-
-  gember.event_sourcing.resolver.domain_event.normalized_event_name.interface.interface_normalized_event_name_resolver:
-    class: Gember\EventSourcing\Resolver\DomainEvent\NormalizedEventName\Interface\InterfaceNormalizedEventNameResolver
-
-  gember.event_sourcing.resolver.domain_event.normalized_event_name.class_name.class_name_normalized_event_name_resolver:
-    class: Gember\EventSourcing\Resolver\DomainEvent\NormalizedEventName\ClassName\ClassNameNormalizedEventNameResolver
-    arguments:
-      - '@gember.event_sourcing.util.string.friendly_class_namer.friendly_class_namer'
-
   gember.event_sourcing.util.attribute.resolver.attribute_resolver:
     class: Gember\EventSourcing\Util\Attribute\Resolver\Reflector\ReflectorAttributeResolver
 
-  gember.event_sourcing.util.resolver.cached.cached_attribute_resolver_decorator:
-    class: Gember\EventSourcing\Util\Attribute\Resolver\Cached\CachedAttributeResolverDecorator
-    #decorates: gember.event_sourcing.util.attribute.resolver.attribute_resolver
-    arguments:
-      - '@.inner'
-      - '@gember.event_sourcing.util.string.friendly_class_namer.friendly_class_namer'
-      - '@gember.psr.simple_cache.cache_interface'
-
   gember.psr.simple_cache.cache_interface: '@gember.symfony.component.cache.psr16_cache'
 
   gember.symfony.component.cache.psr16_cache:
@@ -242,3 +196,55 @@ services:
     arguments:
       - '@gember.event_sourcing.resolver.use_case.domain_tag_properties.domain_tag_properties_resolver'
       - '@gember.event_sourcing.resolver.use_case.subscriber_method_for_event.subscriber_method_for_event_resolver'
+
+  gember.event_sourcing.resolver.domain_event.domain_event_resolver:
+    class: Gember\EventSourcing\Resolver\DomainEvent\Default\DefaultDomainEventResolver
+    arguments:
+      - '@gember.event_sourcing.resolver.domain_event.default.event_name.event_name_resolver'
+      - '@gember.event_sourcing.resolver.common.domain_tag.domain_tag_resolver'
+
+  gember.event_sourcing.resolver.domain_event.cached.cached_domain_event_resolver_decorator:
+    class: Gember\EventSourcing\Resolver\DomainEvent\Cached\CachedDomainEventResolverDecorator
+    #decorates: gember.event_sourcing.resolver.domain_event.domain_event_resolver
+    arguments:
+      - '@.inner'
+      - '@gember.psr.simple_cache.cache_interface'
+      - '@gember.event_sourcing.util.string.friendly_class_namer.friendly_class_namer'
+
+  gember.event_sourcing.resolver.domain_event.default.event_name.event_name_resolver:
+    class: Gember\EventSourcing\Resolver\DomainEvent\Default\EventName\Stacked\StackedEventNameResolver
+    arguments:
+      - [
+        '@gember.event_sourcing.resolver.domain_event.default.event_name.attribute.attribute_event_name_resolver',
+        '@gember.event_sourcing.resolver.domain_event.default.event_name.interface.interface_event_name_resolver'
+      ]
+      - '@gember.event_sourcing.resolver.domain_event.default.event_name.class_name.class_name_event_name_resolver'
+
+  gember.event_sourcing.resolver.domain_event.default.event_name.class_name.class_name_event_name_resolver:
+    class: Gember\EventSourcing\Resolver\DomainEvent\Default\EventName\ClassName\ClassNameEventNameResolver
+    arguments:
+      - '@gember.event_sourcing.util.string.friendly_class_namer.friendly_class_namer'
+
+  gember.event_sourcing.resolver.domain_event.default.event_name.attribute.attribute_event_name_resolver:
+    class: Gember\EventSourcing\Resolver\DomainEvent\Default\EventName\Attribute\AttributeEventNameResolver
+    arguments:
+      - '@gember.event_sourcing.util.attribute.resolver.attribute_resolver'
+
+  gember.event_sourcing.resolver.domain_event.default.event_name.interface.interface_event_name_resolver:
+    class: Gember\EventSourcing\Resolver\DomainEvent\Default\EventName\Interface\InterfaceEventNameResolver
+
+  gember.event_sourcing.resolver.common.domain_tag.domain_tag_resolver:
+    class: Gember\EventSourcing\Resolver\Common\DomainTag\Stacked\StackedDomainTagResolver
+    arguments:
+      - [
+        '@gember.event_sourcing.resolver.common.domain_tag.attribute.attribute_domain_tag_resolver',
+        '@gember.event_sourcing.resolver.common.domain_tag.interface.interface_domain_tag_resolver'
+      ]
+
+  gember.event_sourcing.resolver.common.domain_tag.attribute.attribute_domain_tag_resolver:
+    class: Gember\EventSourcing\Resolver\Common\DomainTag\Attribute\AttributeDomainTagResolver
+    arguments:
+      - '@gember.event_sourcing.util.attribute.resolver.attribute_resolver'
+
+  gember.event_sourcing.resolver.common.domain_tag.interface.interface_domain_tag_resolver:
+    class: Gember\EventSourcing\Resolver\Common\DomainTag\Interface\InterfaceDomainTagResolver

src/GemberEventSourcingBundle.php

@@ -115,8 +115,8 @@ public function loadExtension(array $config, ContainerConfigurator $container, C
             $services->get('gember.event_sourcing.registry.command_handler.cached.cached_command_handler_registry_decorator')
                 ->decorate('gember.event_sourcing.registry.command_handler.command_handler_registry');
 
-            $services->get('gember.event_sourcing.util.resolver.cached.cached_attribute_resolver_decorator')
-                ->decorate('gember.event_sourcing.util.attribute.resolver.attribute_resolver');
+            $services->get('gember.event_sourcing.resolver.domain_event.cached.cached_domain_event_resolver_decorator')
+                ->decorate('gember.event_sourcing.resolver.domain_event.domain_event_resolver');
 
             $cacheType = isset($config['cache']['psr16']) ? 'psr16' : 'psr6';
             $cacheService = ltrim($config['cache'][$cacheType]['service'] ?? 'cache.app', '@');