MAGETWO-90041: Changing the code structure for segmentation for Category Product Indexer

Author: slopukhov

app/code/Magento/Catalog/Model/Indexer/Category/Product/Plugin/StoreGroup.php

@@ -10,7 +10,7 @@
 use Magento\Framework\Model\AbstractModel;
 use Magento\Catalog\Model\Indexer\Category\Product;
 use Magento\Framework\App\ObjectManager;
-use Magento\Catalog\Model\Indexer\Category\Product\tableMaintainer;
+use Magento\Catalog\Model\Indexer\Category\Product\TableMaintainer;
 
 class StoreGroup
 {

app/code/Magento/Catalog/Model/ProductCategoryList.php

@@ -10,7 +10,7 @@
 use Magento\Framework\DB\Sql\UnionExpression;
 use Magento\Framework\App\ObjectManager;
 use Magento\Store\Model\StoreManagerInterface;
-use Magento\Catalog\Model\Indexer\Category\Product\tableMaintainer;
+use Magento\Catalog\Model\Indexer\Category\Product\TableMaintainer;
 
 /**
  * Provides info about product categories.

app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php

@@ -18,7 +18,7 @@
 use Magento\Framework\DB\Select;
 use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Store\Model\Store;
-use Magento\Catalog\Model\Indexer\Category\Product\tableMaintainer;
+use Magento\Catalog\Model\Indexer\Category\Product\TableMaintainer;
 
 /**
  * Product collection

app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Plugin/Aggregation/Category/DataProvider.php

@@ -16,6 +16,9 @@
 use Magento\Framework\Indexer\ScopeResolver\IndexScopeResolver as TableResolver;
 use Magento\Catalog\Model\Indexer\Category\Product\AbstractAction;
 
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class DataProvider
 {
     /**
@@ -51,8 +54,7 @@ public function __construct(
         ResourceConnection $resource,
         ScopeResolverInterface $scopeResolver,
         Resolver $layerResolver,
-        TableResolver $tableResolver = null,
-        Dimension $catalogCategoryProductDimension = null
+        TableResolver $tableResolver = null
     ) {
         $this->resource = $resource;
         $this->scopeResolver = $scopeResolver;

app/code/Magento/CatalogSearch/Model/Search/FilterMapper/ExclusionStrategy.php

@@ -53,8 +53,7 @@ public function __construct(
         \Magento\Framework\App\ResourceConnection $resourceConnection,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
         AliasResolver $aliasResolver,
-        TableResolver $tableResolver = null,
-        Dimension $catalogCategoryProductDimension = null
+        TableResolver $tableResolver = null
     ) {
         $this->resourceConnection = $resourceConnection;
         $this->storeManager = $storeManager;