MAGETWO-71554: Category edit performance issue - for 2.2

Author: dhorytskyi

app/code/Magento/CatalogRule/Model/Indexer/IndexBuilder.php

@@ -161,6 +161,7 @@ class IndexBuilder
      * @param \Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher|null $activeTableSwitcher
      * @param ProductLoader|null $productLoader
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
+     * @SuppressWarnings(PHPMD.NPathComplexity)
      */
     public function __construct(
         RuleCollectionFactory $ruleCollectionFactory,

app/code/Magento/CatalogUrlRewrite/Test/Unit/Observer/UrlRewriteHandlerTest.php

@@ -127,13 +127,7 @@ public function testGenerateProductUrlRewrites()
     {
         /* @var \Magento\Catalog\Model\Category|\PHPUnit_Framework_MockObject_MockObject $category */
         $category = $this->getMockBuilder(\Magento\Catalog\Model\Category::class)
-            ->setMethods([
-                'getEntityId',
-                'getStoreId',
-                'getData',
-                'getAffectedProductIds',
-                'dataHasChangedFor',
-            ])
+            ->setMethods(['getEntityId', 'getStoreId', 'getData', 'getChangedProductIds'])
             ->disableOriginalConstructor()
             ->getMock();
         $category->expects($this->any())
@@ -142,9 +136,6 @@ public function testGenerateProductUrlRewrites()
         $category->expects($this->any())
             ->method('getStoreId')
             ->willReturn(1);
-        $category->expects($this->atLeastOnce())
-            ->method('dataHasChangedFor')
-            ->willReturn('true');
         $category->expects($this->any())
             ->method('getData')
             ->with('save_rewrites_history')