MAGETWO-70651: Saving category create not valid url-rewrites

Author: slopukhov

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

@@ -11,7 +11,6 @@
 /**
  * Class ProductUrlRewriteGenerator
  * @package Magento\CatalogUrlRewrite\Model
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class CategoryProductUrlPathGenerator
 {
@@ -30,7 +29,7 @@ public function __construct(
     }
 
     /**
-     * Generate product url rewrites based on category
+     * Generate product url rewrites based on all product categories
      *
      * @param \Magento\Catalog\Model\Product $product
      * @param int|null $rootCategoryId

app/code/Magento/CatalogUrlRewrite/Observer/UrlRewriteHandler.php

@@ -25,7 +25,7 @@ class UrlRewriteHandler
     /** @var \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory */
     protected $productCollectionFactory;
 
-    /** @var \Magento\CatalogUrlRewrite\Model\CategoryBasedProductRewriteGenerator */
+    /** @var \Magento\CatalogUrlRewrite\Model\CategoryProductUrlPathGenerator */
     private $categoryBasedProductRewriteGenerator;
 
     /** @var \Magento\UrlRewrite\Model\MergeDataProvider */
@@ -40,6 +40,7 @@ class UrlRewriteHandler
      * @param \Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator $productUrlRewriteGenerator
      * @param \Magento\UrlRewrite\Model\UrlPersistInterface $urlPersist
      * @param \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory $productCollectionFactory
+     * @param \Magento\CatalogUrlRewrite\Model\CategoryProductUrlPathGenerator $categoryBasedProductRewriteGenerator
      * @param \Magento\UrlRewrite\Model\MergeDataProviderFactory|null $mergeDataProviderFactory
      * @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
      */
@@ -49,6 +50,7 @@ public function __construct(
         \Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator $productUrlRewriteGenerator,
         \Magento\UrlRewrite\Model\UrlPersistInterface $urlPersist,
         \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory $productCollectionFactory,
+        \Magento\CatalogUrlRewrite\Model\CategoryProductUrlPathGenerator $categoryBasedProductRewriteGenerator,
         \Magento\UrlRewrite\Model\MergeDataProviderFactory $mergeDataProviderFactory = null,
         \Magento\Framework\Serialize\Serializer\Json $serializer = null
     ) {
@@ -57,6 +59,7 @@ public function __construct(
         $this->productUrlRewriteGenerator = $productUrlRewriteGenerator;
         $this->urlPersist = $urlPersist;
         $this->productCollectionFactory = $productCollectionFactory;
+        $this->categoryBasedProductRewriteGenerator = $categoryBasedProductRewriteGenerator;
 
         if (!isset($mergeDataProviderFactory)) {
             $mergeDataProviderFactory =  \Magento\Framework\App\ObjectManager::getInstance()->get(
@@ -158,29 +161,13 @@ private function getCategoryProductsUrlRewrites(
             $product->setStoreId($storeId);
             $product->setData('save_rewrites_history', $saveRewriteHistory);
             $mergeDataProvider->merge(
-                $this->getCategoryBasedProductRewriteGenerator()->generate($product, $rootCategoryId)
+                $this->categoryBasedProductRewriteGenerator->generate($product, $rootCategoryId)
             );
         }
 
         return $mergeDataProvider->getData();
     }
 
-    /**
-     * Retrieve generator, which use all product categories for different products
-     *
-     * @deprecated
-     * @return \Magento\CatalogUrlRewrite\Model\CategoryProductUrlPathGenerator|mixed
-     */
-    private function getCategoryBasedProductRewriteGenerator()
-    {
-        if (!$this->categoryBasedProductRewriteGenerator) {
-            $this->categoryBasedProductRewriteGenerator = \Magento\Framework\App\ObjectManager::getInstance()
-                ->get(\Magento\CatalogUrlRewrite\Model\CategoryProductUrlPathGenerator::class);
-        }
-
-        return $this->categoryBasedProductRewriteGenerator;
-    }
-
     /**
      * @param \Magento\Catalog\Model\Category $category
      * @return void