MAGETWO-60154: [Backport] Saving category deletes UrlRewrites for subcategories and all products in them - for 2.1.x

Author: StasKozar

app/code/Magento/CatalogUrlRewrite/Model/CategoryProductUrlPathGenerator.php

@@ -9,8 +9,7 @@
 use Magento\Catalog\Model\Product\Visibility;
 
 /**
- * Class ProductUrlRewriteGenerator.
- * @package Magento\CatalogUrlRewrite\Model
+ * Generates product url rewrites based on all categories.
  */
 class CategoryProductUrlPathGenerator
 {

app/code/Magento/CatalogUrlRewrite/Model/ProductScopeRewriteGenerator.php

@@ -251,6 +251,7 @@ private function getCategoryWithOverriddenUrlKey($storeId, Category $category)
         if (!$isUrlKeyOverridden) {
             return $category;
         }
+
         return $this->categoryRepository->get($category->getEntityId(), $storeId);
     }
 }

app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/CategoryProductUrlPathGeneratorTest.php

@@ -12,7 +12,7 @@
 use Magento\Catalog\Model\ResourceModel\Category\Collection;
 
 /**
- * Class CategoryProductUrlPathGeneratorTest
+ * Tests CategoryProductUrlPathGenerator class.
  */
 class CategoryProductUrlPathGeneratorTest extends \PHPUnit_Framework_TestCase
 {

dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Model/CategoryUrlRewriteGeneratorTest.php

@@ -12,7 +12,6 @@
 use Magento\UrlRewrite\Model\OptionProvider;
 use Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator;
 
-
 /**
  * @magentoAppArea adminhtml
  */
@@ -122,7 +121,7 @@ public function testGenerateUrlRewritesWithSaveHistory()
 
         $categoryFilter = [
             UrlRewrite::ENTITY_TYPE => CategoryUrlRewriteGenerator::ENTITY_TYPE,
-            UrlRewrite::ENTITY_ID => [3, 4, 5]
+            UrlRewrite::ENTITY_ID => [3, 4, 5],
         ];
         $actualResults = $this->getActualResults($categoryFilter);
         $categoryExpectedResult = [
@@ -135,7 +134,7 @@ public function testGenerateUrlRewritesWithSaveHistory()
                 'category-1/category-1-1/category-1-1-1.html',
                 'new-url/category-1-1/category-1-1-1.html',
                 0,
-                OptionProvider::PERMANENT
+                OptionProvider::PERMANENT,
             ],
         ];