ENGCOM-5317: Cache Elasticsearch field mappers per entity #23283

Author: VladimirZaets

app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/FieldMapperResolver.php

@@ -9,6 +9,9 @@
 use Magento\Elasticsearch\Model\Adapter\FieldMapperInterface;
 use Magento\Elasticsearch\Model\Config;
 
+/**
+ * Field Mapper resolver.
+ */
 class FieldMapperResolver implements FieldMapperInterface
 {
     /**
@@ -24,11 +27,11 @@ class FieldMapperResolver implements FieldMapperInterface
     private $fieldMappers;
 
     /**
-     * Field Mapper instance
+     * Field Mapper instance per entity
      *
-     * @var FieldMapperInterface
+     * @var FieldMapperInterface[]
      */
-    private $fieldMapperEntity;
+    private $fieldMapperEntity = [];
 
     /**
      * @param ObjectManagerInterface $objectManager
@@ -43,7 +46,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getFieldName($attributeCode, $context = [])
     {
@@ -52,7 +55,7 @@ public function getFieldName($attributeCode, $context = [])
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getAllAttributesTypes($context = [])
     {
@@ -69,8 +72,9 @@ public function getAllAttributesTypes($context = [])
      */
     private function getEntity($entityType)
     {
-        if (empty($this->fieldMapperEntity)) {
+        if (empty($this->fieldMapperEntity[$entityType])) {
             if (empty($entityType)) {
+                // phpcs:ignore Magento2.Exceptions.DirectThrow
                 throw new \Exception(
                     'No entity type given'
                 );
@@ -81,13 +85,13 @@ private function getEntity($entityType)
                 );
             }
             $fieldMapperClass = $this->fieldMappers[$entityType];
-            $this->fieldMapperEntity = $this->objectManager->create($fieldMapperClass);
-            if (!($this->fieldMapperEntity instanceof FieldMapperInterface)) {
+            $this->fieldMapperEntity[$entityType] = $this->objectManager->create($fieldMapperClass);
+            if (!($this->fieldMapperEntity[$entityType] instanceof FieldMapperInterface)) {
                 throw new \InvalidArgumentException(
                     'Field mapper must implement \Magento\Elasticsearch\Model\Adapter\FieldMapperInterface'
                 );
             }
         }
-        return $this->fieldMapperEntity;
+        return $this->fieldMapperEntity[$entityType];
     }
 }