MAGETWO-35250: URL Rewrite is not removed after removing category

 - CR changes around plugin

Author: marcozheng

app/code/Magento/CatalogUrlRewrite/Model/Category/Plugin/Category/Remove.php

@@ -41,14 +41,14 @@ public function __construct(
     /**
      * Remove product urls from storage
      *
-     * @param \Magento\Catalog\Model\CategoryRepository $subject
+     * @param \Magento\Catalog\Model\Resource\Category $subject
      * @param callable $proceed
      * @param CategoryInterface $category
      * @return mixed
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function aroundDelete(
-        \Magento\Catalog\Model\CategoryRepository $subject,
+        \Magento\Catalog\Model\Resource\Category $subject,
         \Closure $proceed,
         CategoryInterface $category
     ) {

app/code/Magento/CatalogUrlRewrite/etc/adminhtml/di.xml

@@ -12,14 +12,12 @@
     <type name="Magento\Store\Model\Resource\Group">
         <plugin name="group_plugin" type="Magento\CatalogUrlRewrite\Model\Category\Plugin\Store\Group"/>
     </type>
-    <type name="Magento\Catalog\Model\CategoryRepository">
-        <plugin name="category_delete_plugin" type="Magento\CatalogUrlRewrite\Model\Category\Plugin\Category\Remove"/>
-    </type>
     <type name="Magento\CatalogImportExport\Model\Import\Product">
         <plugin name="import_save_plugin" type="Magento\CatalogUrlRewrite\Model\Product\Plugin\Import"/>
     </type>
     <type name="Magento\Catalog\Model\Resource\Category">
         <plugin name="category_move_plugin" type="Magento\CatalogUrlRewrite\Model\Category\Plugin\Category\Move"/>
+        <plugin name="category_delete_plugin" type="Magento\CatalogUrlRewrite\Model\Category\Plugin\Category\Remove"/>
     </type>
     <type name="Magento\UrlRewrite\Model\StorageInterface">
         <plugin name="storage_plugin" type="Magento\CatalogUrlRewrite\Model\Category\Plugin\Storage"/>

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

@@ -16,10 +16,8 @@
             <argument name="urlFinder" xsi:type="object">Magento\CatalogUrlRewrite\Model\Storage\DbStorage</argument>
         </arguments>
     </type>
-    <type name="Magento\Catalog\Model\CategoryRepository">
-        <plugin name="category_delete_plugin" type="Magento\CatalogUrlRewrite\Model\Category\Plugin\Category\Remove"/>
-    </type>
     <type name="Magento\Catalog\Model\Resource\Category">
         <plugin name="category_move_plugin" type="Magento\CatalogUrlRewrite\Model\Category\Plugin\Category\Move"/>
+        <plugin name="category_delete_plugin" type="Magento\CatalogUrlRewrite\Model\Category\Plugin\Category\Remove"/>
     </type>
 </config>