MAGETWO-38948: [GITHUB#1341] No ability to specify attribute set Id on product repository getList

Author: Yaroslav Onischenko

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

@@ -49,11 +49,6 @@ class Repository implements \Magento\Catalog\Api\ProductAttributeRepositoryInter
      */
     protected $searchCriteriaBuilder;
 
-    /**
-     * @var \Magento\Framework\Api\FilterBuilder
-     */
-    protected $filterBuilder;
-
     /**
      * @param \Magento\Catalog\Model\Resource\Attribute $attributeResource
      * @param \Magento\Catalog\Helper\Product $productHelper
@@ -62,8 +57,6 @@ class Repository implements \Magento\Catalog\Api\ProductAttributeRepositoryInter
      * @param \Magento\Eav\Model\Config $eavConfig
      * @param \Magento\Eav\Model\Adminhtml\System\Config\Source\Inputtype\ValidatorFactory $validatorFactory
      * @param \Magento\Framework\Api\SearchCriteriaBuilder $searchCriteriaBuilder
-     * @param \Magento\Framework\Api\FilterBuilder $filterBuilder
-     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
         \Magento\Catalog\Model\Resource\Attribute $attributeResource,
@@ -72,8 +65,7 @@ public function __construct(
         \Magento\Eav\Api\AttributeRepositoryInterface $eavAttributeRepository,
         \Magento\Eav\Model\Config $eavConfig,
         \Magento\Eav\Model\Adminhtml\System\Config\Source\Inputtype\ValidatorFactory $validatorFactory,
-        \Magento\Framework\Api\SearchCriteriaBuilder $searchCriteriaBuilder,
-        \Magento\Framework\Api\FilterBuilder $filterBuilder
+        \Magento\Framework\Api\SearchCriteriaBuilder $searchCriteriaBuilder
     ) {
         $this->attributeResource = $attributeResource;
         $this->productHelper = $productHelper;
@@ -82,7 +74,6 @@ public function __construct(
         $this->eavConfig = $eavConfig;
         $this->inputtypeValidatorFactory = $validatorFactory;
         $this->searchCriteriaBuilder = $searchCriteriaBuilder;
-        $this->filterBuilder = $filterBuilder;
     }
 
     /**
@@ -209,19 +200,7 @@ public function deleteById($attributeCode)
      */
     public function getCustomAttributesMetadata($dataObjectClassName = null)
     {
-        $defaultAttributeSetId = $this->eavConfig
-            ->getEntityType(\Magento\Catalog\Api\Data\ProductAttributeInterface::ENTITY_TYPE_CODE)
-            ->getDefaultAttributeSetId();
-        $searchCriteria = $this->searchCriteriaBuilder->addFilter(
-            [
-                $this->filterBuilder
-                    ->setField('attribute_set_id')
-                    ->setValue($defaultAttributeSetId)
-                    ->create(),
-            ]
-        );
-
-        return $this->getList($searchCriteria->create())->getItems();
+        return $this->getList($this->searchCriteriaBuilder->create())->getItems();
     }
 
     /**

app/code/Magento/Catalog/Test/Unit/Model/Product/Attribute/RepositoryTest.php

@@ -58,11 +58,6 @@ class RepositoryTest extends \PHPUnit_Framework_TestCase
      */
     protected $searchCriteriaBuilderMock;
 
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $filterBuilderMock;
-
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
      */
@@ -89,8 +84,6 @@ protected function setUp()
             false);
         $this->searchCriteriaBuilderMock =
             $this->getMock('Magento\Framework\Api\SearchCriteriaBuilder', [], [], '', false);
-        $this->filterBuilderMock =
-            $this->getMock('Magento\Framework\Api\FilterBuilder', [], [], '', false);
         $this->searchResultMock =
             $this->getMock(
                 '\Magento\Framework\Api\SearchResultsInterface',
@@ -114,8 +107,7 @@ protected function setUp()
             $this->eavAttributeRepositoryMock,
             $this->eavConfigMock,
             $this->validatorFactoryMock,
-            $this->searchCriteriaBuilderMock,
-            $this->filterBuilderMock
+            $this->searchCriteriaBuilderMock
         );
     }
 
@@ -169,20 +161,6 @@ public function testDeleteById()
 
     public function testGetCustomAttributesMetadata()
     {
-        $filterMock = $this->getMock('Magento\Framework\Service\V1\Data\Filter', [], [], '', false);
-        $this->filterBuilderMock->expects($this->once())
-            ->method('setField')
-            ->with('attribute_set_id')
-            ->willReturnSelf();
-        $this->filterBuilderMock->expects($this->once())
-            ->method('setValue')
-            ->with(4)
-            ->willReturnSelf();
-        $this->filterBuilderMock->expects($this->once())->method('create')->willReturn($filterMock);
-        $this->searchCriteriaBuilderMock->expects($this->once())
-            ->method('addFilter')
-            ->with([$filterMock])
-            ->willReturnSelf();
         $searchCriteriaMock = $this->getMock('Magento\Framework\Api\SearchCriteria', [], [], '', false);
         $this->searchCriteriaBuilderMock->expects($this->once())->method('create')->willReturn($searchCriteriaMock);
         $itemMock = $this->getMock('Magento\Catalog\Api\Data\ProductInterface');