MC-31986: Add support for ES 7 to 2.4-develop

Author: irenelagno

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

@@ -11,6 +11,7 @@
 use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\ResolverInterface;
 use Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProviderInterface;
 use Magento\Elasticsearch\Model\Adapter\FieldMapperInterface;
+
 /**
  * Class ProductFieldMapper provides field name by attribute code and retrieve all attribute types
  */

app/code/Magento/Elasticsearch6/etc/di.xml

@@ -133,7 +133,13 @@
             <argument name="fieldProvider" xsi:type="object">elasticsearch5FieldProvider</argument>
         </arguments>
     </virtualType>
-
+    <type name="Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\ProductFieldMapperProxy">
+        <arguments>
+            <argument name="productFieldMappers" xsi:type="array">
+                <item name="elasticsearch6" xsi:type="object">Magento\Elasticsearch6\Model\Adapter\FieldMapper\ProductFieldMapper</item>
+            </argument>
+        </arguments>
+    </type>
     <virtualType name="elasticsearch6FieldNameResolver" type="\Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldName\Resolver\CompositeResolver">
         <arguments>
             <argument name="items" xsi:type="array">

dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php

@@ -4250,7 +4250,6 @@
     ['Magento\Elasticsearch\Model\Client\Elasticsearch'],
     ['Magento\Elasticsearch\SearchAdapter\Aggregation\Interval'],
     ['Magento\Elasticsearch\SearchAdapter\Mapper'],
-    ['Magento\Elasticsearch6\Model\DataProvider\Suggestions'],
     ['Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldType'],
     ['Magento\Elasticsearch\Model\Adapter\DataMapperInterface'],
     ['Magento\Elasticsearch\Elasticsearch5\Model\Adapter\DataMapper\ProductDataMapperProxy'],