refactor: refactor ObjectToObjectTransformer for future optimization (

#231) * refactor: refactor `ObjectToObjectTransformer` for future optimization * refactor * refactor * add to DI * optimize * rename to PropertyMappingMetadata * add metadata id
rekalogika · Oct 14, 2024 · 3845eea · 3845eea
1 parent ac70b31
commit 3845eea
Show file tree

Hide file tree

Showing 17 changed files with 1,501 additions and 744 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 1.11.1
+
+* refactor: refactor `ObjectToObjectTransformer` for future optimization
+
 ## 1.11.0
 
 * refactor: spin off `resolveTargetClass()` to separate class

diff --git a/config/services.php b/config/services.php
@@ -65,6 +65,9 @@
 use Rekalogika\Mapper\Transformer\ObjectToObjectMetadata\Implementation\CachingObjectToObjectMetadataFactory;
 use Rekalogika\Mapper\Transformer\ObjectToObjectMetadata\Implementation\ObjectToObjectMetadataFactory;
 use Rekalogika\Mapper\Transformer\ObjectToObjectMetadata\Implementation\ProxyResolvingObjectToObjectMetadataFactory;
+use Rekalogika\Mapper\TransformerProcessor\ObjectProcessor\DefaultObjectProcessorFactory;
+use Rekalogika\Mapper\TransformerProcessor\PropertyProcessor\CachingPropertyProcessorFactory;
+use Rekalogika\Mapper\TransformerProcessor\PropertyProcessor\DefaultPropertyProcessorFactory;
 use Rekalogika\Mapper\TransformerRegistry\Implementation\CachingTransformerRegistry;
 use Rekalogika\Mapper\TransformerRegistry\Implementation\TransformerRegistry;
 use Rekalogika\Mapper\TypeResolver\Implementation\CachingTypeResolver;
@@ -227,10 +230,7 @@
         ->set(ObjectToObjectTransformer::class)
         ->args([
             '$objectToObjectMetadataFactory' => service('rekalogika.mapper.object_to_object_metadata_factory'),
-            '$propertyMapperLocator' => tagged_locator('rekalogika.mapper.property_mapper'),
-            '$subMapperFactory' => service('rekalogika.mapper.sub_mapper.factory'),
-            '$proxyFactory' => service('rekalogika.mapper.proxy.factory'),
-            '$propertyAccessor' => service(PropertyAccessorInterface::class),
+            '$objectProcessorFactory' => service('rekalogika.mapper.transformer_processor.object_processor_factory'),
         ])
         ->tag('rekalogika.mapper.transformer', ['priority' => -900]);
 
@@ -273,10 +273,7 @@
         )
         ->args([
             '$objectToObjectMetadataFactory' => service('rekalogika.mapper.object_to_object_metadata_factory'),
-            '$propertyMapperLocator' => tagged_locator('rekalogika.mapper.property_mapper'),
-            '$subMapperFactory' => service('rekalogika.mapper.sub_mapper.factory'),
-            '$proxyFactory' => service('rekalogika.mapper.proxy.factory'),
-            '$propertyAccessor' => service(PropertyAccessorInterface::class),
+            '$objectProcessorFactory' => service('rekalogika.mapper.transformer_processor.object_processor_factory'),
         ]);
 
     # mapping cache warmer
@@ -382,6 +379,44 @@
             service($createCache($services, 'transformer_registry')),
         ]);
 
+    # transformer processor, object processor factory
+
+    $services
+        ->set(
+            'rekalogika.mapper.transformer_processor.object_processor_factory',
+            DefaultObjectProcessorFactory::class,
+        )
+        ->args([
+            '$propertyMapperLocator' => tagged_locator('rekalogika.mapper.property_mapper'),
+            '$subMapperFactory' => service('rekalogika.mapper.sub_mapper.factory'),
+            '$proxyFactory' => service('rekalogika.mapper.proxy.factory'),
+            '$propertyAccessor' => service(PropertyAccessorInterface::class),
+            '$propertyProcessorFactory' => service('rekalogika.mapper.transformer_processor.property_processor_factory'),
+        ]);
+
+    # transformer processor, property processor factory
+
+    $services
+        ->set(
+            'rekalogika.mapper.transformer_processor.property_processor_factory',
+            DefaultPropertyProcessorFactory::class,
+        )
+        ->args([
+            '$propertyAccessor' => service(PropertyAccessorInterface::class),
+            '$subMapperFactory' => service('rekalogika.mapper.sub_mapper.factory'),
+            '$propertyMapperLocator' => tagged_locator('rekalogika.mapper.property_mapper'),
+        ]);
+
+    $services
+        ->set(
+            'rekalogika.mapper.transformer_processor.property_processor_factory.caching',
+            CachingPropertyProcessorFactory::class,
+        )
+        ->decorate('rekalogika.mapper.transformer_processor.property_processor_factory')
+        ->args([
+            service('.inner'),
+        ]);
+
     # sub mapper
 
     $services

diff --git a/src/MapperFactory.php b/src/MapperFactory.php
@@ -67,6 +67,11 @@
 use Rekalogika\Mapper\Transformer\MetadataUtil\MetadataUtilLocator;
 use Rekalogika\Mapper\Transformer\ObjectToObjectMetadata\ObjectToObjectMetadataFactoryInterface;
 use Rekalogika\Mapper\Transformer\TransformerInterface;
+use Rekalogika\Mapper\TransformerProcessor\ObjectProcessor\DefaultObjectProcessorFactory;
+use Rekalogika\Mapper\TransformerProcessor\ObjectProcessorFactoryInterface;
+use Rekalogika\Mapper\TransformerProcessor\PropertyProcessor\CachingPropertyProcessorFactory;
+use Rekalogika\Mapper\TransformerProcessor\PropertyProcessor\DefaultPropertyProcessorFactory;
+use Rekalogika\Mapper\TransformerProcessor\PropertyProcessorFactoryInterface;
 use Rekalogika\Mapper\TransformerRegistry\Implementation\TransformerRegistry;
 use Rekalogika\Mapper\TransformerRegistry\TransformerRegistryInterface;
 use Rekalogika\Mapper\TypeResolver\Implementation\CachingTypeResolver;
@@ -197,6 +202,10 @@ class MapperFactory
 
     private ?ProxyFactoryInterface $proxyFactory = null;
 
+    private ?ObjectProcessorFactoryInterface $objectProcessorFactory = null;
+
+    private ?PropertyProcessorFactoryInterface $propertyProcessorFactory = null;
+
     private ?MappingCommand $mappingCommand = null;
 
     private ?TryCommand $tryCommand = null;
@@ -403,17 +412,10 @@ protected function getNullTransformer(): TransformerInterface
 
     protected function getObjectToObjectTransformer(): TransformerInterface
     {
-        if (null === $this->objectToObjectTransformer) {
-            $this->objectToObjectTransformer = new ObjectToObjectTransformer(
-                objectToObjectMetadataFactory: $this->getObjectToObjectMetadataFactory(),
-                propertyMapperLocator: $this->getPropertyMapperLocator(),
-                subMapperFactory: $this->getSubMapperFactory(),
-                proxyFactory: $this->getProxyFactory(),
-                propertyAccessor: $this->getPropertyAccessor(),
-            );
-        }
-
-        return $this->objectToObjectTransformer;
+        return $this->objectToObjectTransformer ??= new ObjectToObjectTransformer(
+            $this->getObjectToObjectMetadataFactory(),
+            $this->getObjectProcessorFactory(),
+        );
     }
 
     protected function getObjectToStringTransformer(): TransformerInterface
@@ -899,6 +901,32 @@ protected function getProxyFactory(): ProxyFactoryInterface
         return $this->proxyFactory;
     }
 
+    //
+    // transformer processor
+    //
+
+    protected function getObjectProcessorFactory(): ObjectProcessorFactoryInterface
+    {
+        return $this->objectProcessorFactory ??= new DefaultObjectProcessorFactory(
+            propertyMapperLocator: $this->getPropertyMapperLocator(),
+            subMapperFactory: $this->getSubMapperFactory(),
+            proxyFactory: $this->getProxyFactory(),
+            propertyAccessor: $this->getPropertyAccessor(),
+            propertyProcessorFactory: $this->getPropertyProcessorFactory(),
+        );
+    }
+
+    protected function getPropertyProcessorFactory(): PropertyProcessorFactoryInterface
+    {
+        return $this->propertyProcessorFactory ??= new CachingPropertyProcessorFactory(
+            new DefaultPropertyProcessorFactory(
+                propertyAccessor: $this->getPropertyAccessor(),
+                subMapperFactory: $this->getSubMapperFactory(),
+                propertyMapperLocator: $this->getPropertyMapperLocator(),
+            ),
+        );
+    }
+
     //
     // command
     //