MAGETWO-93258: [Forwardport] Optimize retrieving product attributes

Author: duhon

app/code/Magento/CatalogInventory/Model/FilterCustomAttribute.php renamed to app/code/Magento/Catalog/Model/FilterProductCustomAttribute.php

@@ -5,7 +5,10 @@
  */
 namespace Magento\CatalogInventory\Model;
 
-class FilterCustomAttribute
+/**
+ * Filter custom attributes for product using the blacklist
+ */
+class FilterProductCustomAttribute
 {
     /**
      * @var array
@@ -22,7 +25,6 @@ public function __construct(array $blackList = [])
 
     /**
      * Delete custom attribute
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      * @param array $attributes
      * @return mixed
      */

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\FilterCustomAttribute;
+use Magento\CatalogInventory\Model\FilterProductCustomAttribute;
 use Magento\Framework\Api\AttributeValueFactory;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\App\ObjectManager;
@@ -349,7 +349,7 @@ class Product extends \Magento\Catalog\Model\AbstractModel implements
      */
     private $eavConfig;
     /**
-     * @var FilterCustomAttribute|null
+     * @var FilterProductCustomAttribute|null
      */
     private $filterCustomAttribute;
 
@@ -390,7 +390,7 @@ class Product extends \Magento\Catalog\Model\AbstractModel implements
      * @param \Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface $joinProcessor
      * @param array $data
      * @param \Magento\Eav\Model\Config|null $config
-     * @param FilterCustomAttribute|null $filterCustomAttribute
+     * @param FilterProductCustomAttribute|null $filterCustomAttribute
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
@@ -431,7 +431,7 @@ public function __construct(
         \Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface $joinProcessor,
         array $data = [],
         \Magento\Eav\Model\Config $config = null,
-        FilterCustomAttribute $filterCustomAttribute = null
+        FilterProductCustomAttribute $filterCustomAttribute = null
     ) {
         $this->metadataService = $metadataService;
         $this->_itemOptionFactory = $itemOptionFactory;
@@ -472,7 +472,7 @@ public function __construct(
         );
         $this->eavConfig = $config ?? ObjectManager::getInstance()->get(\Magento\Eav\Model\Config::class);
         $this->filterCustomAttribute = $filterCustomAttribute
-            ?? ObjectManager::getInstance()->get(FilterCustomAttribute::class);
+            ?? ObjectManager::getInstance()->get(FilterProductCustomAttribute::class);
     }
 
     /**

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\FilterCustomAttribute|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\CatalogInventory\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\FilterCustomAttribute::class
+            \Magento\CatalogInventory\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\FilterCustomAttribute as Filter;
+use Magento\CatalogInventory\Model\FilterProductCustomAttribute as Filter;
 
 class FilterCustomAttribute
 {

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

@@ -40,7 +40,7 @@
             <argument name="filter" xsi:type="object">Magento\CatalogInventory\Model\FilterCustomAttribute</argument>
         </arguments>
     </type>
-    <type name="Magento\CatalogInventory\Model\FilterCustomAttribute">
+    <type name="Magento\Catalog\Model\FilterProductCustomAttribute">
         <arguments>
             <argument name="blackList" xsi:type="array">
                 <item name="quantity_and_stock_status" xsi:type="string">quantity_and_stock_status</item>
@@ -82,7 +82,7 @@
     </type>
     <type name="Magento\Catalog\Model\Product">
         <arguments>
-            <argument name="filter" xsi:type="object">Magento\CatalogInventory\Model\FilterCustomAttribute</argument>
+            <argument name="filter" xsi:type="object">Magento\Catalog\Model\FilterProductCustomAttribute</argument>
         </arguments>
         <plugin name="catalogInventoryAfterLoad" type="Magento\CatalogInventory\Model\Plugin\AfterProductLoad"/>
     </type>