MAGETWO-94482: [2.3] Fixed procedure of creating mapping for dynamic fields in elasticsearch

- fix static tests

Author: vgoncharenko

app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/BatchDataMapper/CategoryFieldsProvider.php

@@ -10,8 +10,7 @@
 use Magento\AdvancedSearch\Model\Adapter\DataMapper\AdditionalFieldsProviderInterface;
 use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeProvider;
 use Magento\Framework\App\ObjectManager;
-use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\ResolverInterface
-    as FieldNameResolver;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\ResolverInterface;
 
 /**
  * Provide data mapping for categories fields
@@ -29,29 +28,29 @@ class CategoryFieldsProvider implements AdditionalFieldsProviderInterface
     private $attributeAdapterProvider;
 
     /**
-     * @var FieldNameResolver
+     * @var ResolverInterface
      */
     private $fieldNameResolver;
 
     /**
      * @param Index $resourceIndex
      * @param AttributeProvider|null $attributeAdapterProvider
-     * @param FieldNameResolver|null $fieldNameResolver
+     * @param ResolverInterface|null $fieldNameResolver
      */
     public function __construct(
         Index $resourceIndex,
         AttributeProvider $attributeAdapterProvider = null,
-        FieldNameResolver $fieldNameResolver = null
+        ResolverInterface $fieldNameResolver = null
     ) {
         $this->resourceIndex = $resourceIndex;
         $this->attributeAdapterProvider = $attributeAdapterProvider ?: ObjectManager::getInstance()
             ->get(AttributeProvider::class);
         $this->fieldNameResolver = $fieldNameResolver ?: ObjectManager::getInstance()
-            ->get(FieldNameResolver::class);
+            ->get(ResolverInterface::class);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getFields(array $productIds, $storeId)
     {

app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/DataMapper/ProductDataMapper.php

@@ -17,10 +17,11 @@
 use Magento\Elasticsearch\Model\Adapter\FieldType\Date as DateFieldType;
 use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeProvider;
 use Magento\Framework\App\ObjectManager;
-use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\ResolverInterface
-    as FieldNameResolver;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\ResolverInterface;
 
 /**
+ * Don't use this product data mapper class.
+ *
  * @deprecated 100.2.0
  * @see \Magento\Elasticsearch\Model\Adapter\BatchDataMapperInterface
  */
@@ -89,7 +90,7 @@ class ProductDataMapper implements DataMapperInterface
     private $attributeAdapterProvider;
 
     /**
-     * @var FieldNameResolver
+     * @var ResolverInterface
      */
     private $fieldNameResolver;
 
@@ -103,7 +104,7 @@ class ProductDataMapper implements DataMapperInterface
      * @param StoreManagerInterface $storeManager
      * @param DateFieldType $dateFieldType
      * @param AttributeProvider|null $attributeAdapterProvider
-     * @param FieldNameResolver|null $fieldNameResolver
+     * @param ResolverInterface|null $fieldNameResolver
      */
     public function __construct(
         Builder $builder,
@@ -113,7 +114,7 @@ public function __construct(
         StoreManagerInterface $storeManager,
         DateFieldType $dateFieldType,
         AttributeProvider $attributeAdapterProvider = null,
-        FieldNameResolver $fieldNameResolver = null
+        ResolverInterface $fieldNameResolver = null
     ) {
         $this->builder = $builder;
         $this->attributeContainer = $attributeContainer;
@@ -124,7 +125,7 @@ public function __construct(
         $this->attributeAdapterProvider = $attributeAdapterProvider ?: ObjectManager::getInstance()
             ->get(AttributeProvider::class);
         $this->fieldNameResolver = $fieldNameResolver ?: ObjectManager::getInstance()
-            ->get(FieldNameResolver::class);
+            ->get(ResolverInterface::class);
 
         $this->mediaGalleryRoles = [
             self::MEDIA_ROLE_IMAGE,
@@ -226,6 +227,8 @@ protected function processAdvancedAttributes($productId, array $productIndexData
     }
 
     /**
+     * Check value.
+     *
      * @param mixed $value
      * @param Attribute $attribute
      * @param string $storeId
@@ -316,6 +319,8 @@ protected function getProductMediaGalleryData($media, $roles)
     }
 
     /**
+     * Get media role image.
+     *
      * @param string $file
      * @param array $roles
      * @return string
@@ -326,6 +331,8 @@ protected function getMediaRoleImage($file, $roles)
     }
 
     /**
+     * Get media role small image.
+     *
      * @param string $file
      * @param array $roles
      * @return string
@@ -336,6 +343,8 @@ protected function getMediaRoleSmallImage($file, $roles)
     }
 
     /**
+     * Get media role thumbnail.
+     *
      * @param string $file
      * @param array $roles
      * @return string
@@ -346,6 +355,8 @@ protected function getMediaRoleThumbnail($file, $roles)
     }
 
     /**
+     * Get media role swatch image.
+     *
      * @param string $file
      * @param array $roles
      * @return string

app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/FieldMapper/Product/FieldProvider/FieldIndex/IndexResolver.php

@@ -52,7 +52,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getFieldIndex(AttributeAdapter $attribute)
     {

app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/FieldMapper/ProductFieldMapper.php

@@ -10,8 +10,7 @@
 use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeProvider;
 use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProviderInterface;
 use Magento\Elasticsearch\Model\Adapter\FieldMapperInterface;
-use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\ResolverInterface
-    as FieldNameResolver;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\ResolverInterface;
 use Magento\Framework\App\ObjectManager;
 use Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldType;
 use Magento\Framework\Registry;
@@ -59,7 +58,7 @@ class ProductFieldMapper implements FieldMapperInterface
     private $attributeAdapterProvider;
 
     /**
-     * @var FieldNameResolver
+     * @var ResolverInterface
      */
     private $fieldNameResolver;
 
@@ -74,7 +73,7 @@ class ProductFieldMapper implements FieldMapperInterface
      * @param CustomerSession $customerSession
      * @param StoreManager $storeManager
      * @param Registry $coreRegistry
-     * @param FieldNameResolver|null $fieldNameResolver
+     * @param ResolverInterface|null $fieldNameResolver
      * @param AttributeProvider|null $attributeAdapterProvider
      * @param FieldProviderInterface|null $fieldProvider
      */
@@ -84,7 +83,7 @@ public function __construct(
         CustomerSession $customerSession,
         StoreManager $storeManager,
         Registry $coreRegistry,
-        FieldNameResolver $fieldNameResolver = null,
+        ResolverInterface $fieldNameResolver = null,
         AttributeProvider $attributeAdapterProvider = null,
         FieldProviderInterface $fieldProvider = null
     ) {
@@ -94,7 +93,7 @@ public function __construct(
         $this->storeManager = $storeManager;
         $this->coreRegistry = $coreRegistry;
         $this->fieldNameResolver = $fieldNameResolver ?: ObjectManager::getInstance()
-            ->get(FieldNameResolver::class);
+            ->get(ResolverInterface::class);
         $this->attributeAdapterProvider = $attributeAdapterProvider ?: ObjectManager::getInstance()
             ->get(AttributeProvider::class);
         $this->fieldProvider = $fieldProvider ?: ObjectManager::getInstance()

app/code/Magento/Elasticsearch/Elasticsearch5/Model/Adapter/FieldType.php

@@ -36,6 +36,8 @@ class FieldType
     /**#@-*/
 
     /**
+     * Get field type.
+     *
      * @deprecated
      * @see ResolverInterface::getFieldType
      *

app/code/Magento/Elasticsearch/Model/Adapter/BatchDataMapper/CategoryFieldsProvider.php

@@ -10,8 +10,7 @@
 use Magento\AdvancedSearch\Model\Adapter\DataMapper\AdditionalFieldsProviderInterface;
 use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeProvider;
 use Magento\Framework\App\ObjectManager;
-use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\ResolverInterface
-    as FieldNameResolver;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\ResolverInterface;
 
 /**
  * Provide data mapping for categories fields
@@ -29,25 +28,25 @@ class CategoryFieldsProvider implements AdditionalFieldsProviderInterface
     private $attributeAdapterProvider;
 
     /**
-     * @var FieldNameResolver
+     * @var ResolverInterface
      */
     private $fieldNameResolver;
 
     /**
      * @param Index $resourceIndex
      * @param AttributeProvider|null $attributeAdapterProvider
-     * @param FieldNameResolver|null $fieldNameResolver
+     * @param ResolverInterface|null $fieldNameResolver
      */
     public function __construct(
         Index $resourceIndex,
         AttributeProvider $attributeAdapterProvider = null,
-        FieldNameResolver $fieldNameResolver = null
+        ResolverInterface $fieldNameResolver = null
     ) {
         $this->resourceIndex = $resourceIndex;
         $this->attributeAdapterProvider = $attributeAdapterProvider ?: ObjectManager::getInstance()
             ->get(AttributeProvider::class);
         $this->fieldNameResolver = $fieldNameResolver ?: ObjectManager::getInstance()
-            ->get(FieldNameResolver::class);
+            ->get(ResolverInterface::class);
     }
 
     /**

app/code/Magento/Elasticsearch/Model/Adapter/BatchDataMapper/PriceFieldsProvider.php

@@ -12,8 +12,7 @@
 use Magento\CatalogSearch\Model\Indexer\Fulltext\Action\DataProvider;
 use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\AttributeProvider;
 use Magento\Framework\App\ObjectManager;
-use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\ResolverInterface
-    as FieldNameResolver;
+use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\ResolverInterface;
 
 /**
  * Provide data mapping for price fields
@@ -41,7 +40,7 @@ class PriceFieldsProvider implements AdditionalFieldsProviderInterface
     private $attributeAdapterProvider;
 
     /**
-     * @var FieldNameResolver
+     * @var ResolverInterface
      */
     private $fieldNameResolver;
 
@@ -50,26 +49,26 @@ class PriceFieldsProvider implements AdditionalFieldsProviderInterface
      * @param DataProvider $dataProvider
      * @param StoreManagerInterface $storeManager
      * @param AttributeProvider|null $attributeAdapterProvider
-     * @param FieldNameResolver|null $fieldNameResolver
+     * @param ResolverInterface|null $fieldNameResolver
      */
     public function __construct(
         Index $resourceIndex,
         DataProvider $dataProvider,
         StoreManagerInterface $storeManager,
         AttributeProvider $attributeAdapterProvider = null,
-        FieldNameResolver $fieldNameResolver = null
+        ResolverInterface $fieldNameResolver = null
     ) {
         $this->resourceIndex = $resourceIndex;
         $this->dataProvider = $dataProvider;
         $this->storeManager = $storeManager;
         $this->attributeAdapterProvider = $attributeAdapterProvider ?: ObjectManager::getInstance()
             ->get(AttributeProvider::class);
         $this->fieldNameResolver = $fieldNameResolver ?: ObjectManager::getInstance()
-            ->get(FieldNameResolver::class);
+            ->get(ResolverInterface::class);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getFields(array $productIds, $storeId)
     {

app/code/Magento/Elasticsearch/Model/Adapter/DataMapper/ProductDataMapper.php

@@ -9,6 +9,8 @@
 use Magento\Elasticsearch\Elasticsearch5\Model\Adapter\DataMapper\ProductDataMapper as ElasticSearch5ProductDataMapper;
 
 /**
+ * Don't use this product data mapper class.
+ *
  * @deprecated 100.2.0
  * @see \Magento\Elasticsearch\Model\Adapter\BatchDataMapperInterface
  */

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

@@ -284,8 +284,8 @@ protected function getDocsArrayInBulkIndexFormat(
      * Checks whether Elasticsearch index and alias exists.
      *
      * @param int $storeId
-     * @param bool $checkAlias
      * @param string $mappedIndexerId
+     * @param bool $checkAlias
      * @return $this
      */
     public function checkIndex(

app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/AttributeProvider.php

@@ -65,7 +65,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getByAttributeCode(string $attributeCode): AttributeAdapter
     {