Merge branch 'develop' into stability_control

Author: magento-devops-queue-mgr-svc

InventoryElasticsearch/Plugin/Model/Adapter/FieldMapper/AdditionalFieldMapperPlugin.php

@@ -7,7 +7,7 @@
 
 namespace Magento\InventoryElasticsearch\Plugin\Model\Adapter\FieldMapper;
 
-use Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\ProductFieldMapper;
+use Magento\Elasticsearch\ElasticAdapter\Model\Adapter\FieldMapper\ProductFieldMapper;
 
 /**
  * Class AdditionalFieldMapperPlugin for es attributes mapping

InventoryElasticsearch/Test/Unit/Plugin/Model/Adapter/FieldMapper/AdditionalFieldMapperPluginTest.php

@@ -7,7 +7,7 @@
 
 namespace Magento\InventoryElasticsearch\Test\Unit\Plugin\Model\Adapter\FieldMapper;
 
-use Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\ProductFieldMapper;
+use Magento\Elasticsearch\ElasticAdapter\Model\Adapter\FieldMapper\ProductFieldMapper;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\InventoryElasticsearch\Plugin\Model\Adapter\FieldMapper\AdditionalFieldMapperPlugin;
 use PHPUnit\Framework\TestCase;

InventoryElasticsearch/etc/di.xml

@@ -12,7 +12,7 @@
         <plugin name="stockedProductsFilterPlugin" disabled="true"/>
         <plugin name="stockedProductFilterByInventoryStockPlugin" type="Magento\InventoryElasticsearch\Plugin\CatalogSearch\Model\Indexer\Fulltext\Action\DataProvider\StockedProductFilterByInventoryStock"/>
     </type>
-    <type name="Magento\Elasticsearch\Elasticsearch5\Model\Adapter\FieldMapper\ProductFieldMapper">
+    <type name="Magento\Elasticsearch\ElasticAdapter\Model\Adapter\FieldMapper\ProductFieldMapper">
         <plugin name="addOutOfStockMapper" type="Magento\InventoryElasticsearch\Plugin\Model\Adapter\FieldMapper\AdditionalFieldMapperPlugin"/>
     </type>
     <type name="Magento\Elasticsearch\Model\Adapter\BatchDataMapper\ProductDataMapper">