MAGETWO-93258: [Forwardport] Optimize retrieving product attributes

Author: duhon

app/code/Magento/Catalog/Model/FilterProductCustomAttribute.php

@@ -3,7 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\CatalogInventory\Model;
+namespace Magento\Catalog\Model;
 
 /**
  * Filter custom attributes for product using the blacklist

app/code/Magento/Catalog/Model/Product.php

@@ -10,7 +10,7 @@
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Api\ProductLinkRepositoryInterface;
 use Magento\Catalog\Model\Product\Attribute\Backend\Media\EntryConverterPool;
-use Magento\CatalogInventory\Model\FilterProductCustomAttribute;
+use Magento\Catalog\Model\FilterProductCustomAttribute;
 use Magento\Framework\Api\AttributeValueFactory;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\App\ObjectManager;

app/code/Magento/Catalog/Test/Unit/Model/ProductTest.php

@@ -80,7 +80,7 @@ class ProductTest extends \PHPUnit\Framework\TestCase
     protected $_priceInfoMock;
 
     /**
-     * @var \Magento\CatalogInventory\Model\FilterProductCustomAttribute|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Catalog\Model\FilterProductCustomAttribute|\PHPUnit_Framework_MockObject_MockObject
      */
     private $filterCustomAttribute;
 
@@ -381,7 +381,7 @@ protected function setUp()
             ->willReturn($this->extensionAttributes);
 
         $this->filterCustomAttribute = $this->createTestProxy(
-            \Magento\CatalogInventory\Model\FilterProductCustomAttribute::class
+            \Magento\Catalog\Model\FilterProductCustomAttribute::class
         );
 
         $this->objectManagerHelper = new ObjectManagerHelper($this);

app/code/Magento/CatalogInventory/Model/Plugin/FilterCustomAttribute.php

@@ -8,7 +8,7 @@
 namespace Magento\CatalogInventory\Model\Plugin;
 
 use Magento\Catalog\Model\Product\Attribute\Repository;
-use Magento\CatalogInventory\Model\FilterProductCustomAttribute as Filter;
+use Magento\Catalog\Model\FilterProductCustomAttribute as Filter;
 
 class FilterCustomAttribute
 {

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

@@ -35,11 +35,6 @@
     <type name="Magento\Catalog\Model\Product\Attribute\Repository">
         <plugin name="filterCustomAttribute" type="Magento\CatalogInventory\Model\Plugin\FilterCustomAttribute" />
     </type>
-    <type name="Magento\CatalogInventory\Model\Plugin\FilterCustomAttribute">
-        <arguments>
-            <argument name="filter" xsi:type="object">Magento\CatalogInventory\Model\FilterCustomAttribute</argument>
-        </arguments>
-    </type>
     <type name="Magento\Catalog\Model\FilterProductCustomAttribute">
         <arguments>
             <argument name="blackList" xsi:type="array">
@@ -81,9 +76,6 @@
         </arguments>
     </type>
     <type name="Magento\Catalog\Model\Product">
-        <arguments>
-            <argument name="filter" xsi:type="object">Magento\Catalog\Model\FilterProductCustomAttribute</argument>
-        </arguments>
         <plugin name="catalogInventoryAfterLoad" type="Magento\CatalogInventory\Model\Plugin\AfterProductLoad"/>
     </type>
     <type name="Magento\Catalog\Model\Product\Action">