Merge remote-tracking branch 'origin/MAGETWO-51740' into MAGETWO-51824

Author: NadiyaS

app/code/Magento/Catalog/Test/Unit/Model/ProductLink/RepositoryTest.php

@@ -97,7 +97,7 @@ protected function setUp()
             false
         );
         $this->hydratorMock = $this->getMock(
-            'Magento\Framework\Model\Entity\EntityHydrator',
+            'Magento\Framework\Model\Entity\Hydrator',
             ['extract'],
             [],
             '',

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

@@ -534,11 +534,11 @@
             </argument>
         </arguments>
     </type>
-    <type name="Magento\Framework\Model\OrchestratorPool">
+    <type name="Magento\Framework\EntityManager\OperationPool">
         <arguments>
             <argument name="operations" xsi:type="array">
                 <item name="default" xsi:type="array">
-                    <item name="read" xsi:type="string">Magento\Framework\Model\Operation\Read</item>
+                    <item name="read" xsi:type="string">Magento\Framework\EntityManager\Operation\Read</item>
                     <item name="create" xsi:type="string">Magento\Framework\EntityManager\Operation\Write\Create</item>
                     <item name="update" xsi:type="string">Magento\Framework\EntityManager\Operation\Write\Update</item>
                     <item name="delete" xsi:type="string">Magento\Framework\EntityManager\Operation\Write\Delete</item>

lib/internal/Magento/Framework/EntityManager/CallbackHandler.php

@@ -25,7 +25,7 @@ class CallbackHandler
     protected $logger;
 
     /**
-     * CommitCallback constructor.
+     * CallbackHandler constructor.
      *
      * @param MetadataPool $metadataPool
      * @param LoggerInterface $logger

lib/internal/Magento/Framework/EntityManager/Operation/Write/Create.php

@@ -6,7 +6,6 @@
 
 namespace Magento\Framework\EntityManager\Operation\Write;
 
-use Magento\Framework\EntityManager\Operation\Write\Create\ValidateCreate;
 use Magento\Framework\EntityManager\Operation\Write\Create\CreateMain;
 use Magento\Framework\EntityManager\Operation\Write\Create\CreateAttributes;
 use Magento\Framework\EntityManager\Operation\Write\Create\CreateExtensions;

lib/internal/Magento/Framework/EntityManager/Operation/Write/Delete.php

@@ -6,7 +6,6 @@
 
 namespace Magento\Framework\EntityManager\Operation\Write;
 
-use Magento\Framework\EntityManager\Operation\Write\Delete\ValidateDelete;
 use Magento\Framework\EntityManager\Operation\Write\Delete\DeleteMain;
 use Magento\Framework\EntityManager\Operation\Write\Delete\DeleteAttributes;
 use Magento\Framework\EntityManager\Operation\Write\Delete\DeleteExtensions;

lib/internal/Magento/Framework/EntityManager/Operation/Write/Update.php

@@ -6,7 +6,6 @@
 
 namespace Magento\Framework\EntityManager\Operation\Write;
 
-use Magento\Framework\EntityManager\Operation\Write\Update\ValidateUpdate;
 use Magento\Framework\EntityManager\Operation\Write\Update\UpdateMain;
 use Magento\Framework\EntityManager\Operation\Write\Update\UpdateAttributes;
 use Magento\Framework\EntityManager\Operation\Write\Update\UpdateExtensions;

lib/internal/Magento/Framework/EntityManager/OperationPool.php

@@ -24,7 +24,7 @@ class OperationPool
     private $objectManager;
 
     /**
-     * OrchestratorPool constructor.
+     * OperationPool constructor.
      * @param ObjectManager $objectManager
      * @param string[] $operations
      */