Cache Elasticsearch field mappers per entity

Author: aapokiiso

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

@@ -24,11 +24,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
@@ -69,7 +69,7 @@ public function getAllAttributesTypes($context = [])
      */
     private function getEntity($entityType)
     {
-        if (empty($this->fieldMapperEntity)) {
+        if (empty($this->fieldMapperEntity[$entityType])) {
             if (empty($entityType)) {
                 throw new \Exception(
                     'No entity type given'
@@ -81,13 +81,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];
     }
 }