ACPT-493: Upload csv with request parameter

Author: aa-kashk

app/code/Magento/ImportExport/Model/Import.php

@@ -193,11 +193,6 @@ class Import extends AbstractModel
      */
     private $messageManager;
 
-    /**
-     * @var SourceFactory
-     */
-    private $sourceFactory;
-
     /**
      * @var Upload
      */
@@ -220,7 +215,6 @@ class Import extends AbstractModel
      * @param DateTime $localeDate
      * @param array $data
      * @param ManagerInterface|null $messageManager
-     * @param SourceFactory|null $sourceFactory
      * @param Upload|null $upload
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
@@ -241,7 +235,6 @@ public function __construct(
         DateTime $localeDate,
         array $data = [],
         ManagerInterface $messageManager = null,
-        SourceFactory $sourceFactory = null,
         Upload $upload = null
     ) {
         $this->_importExportData = $importExportData;
@@ -259,8 +252,6 @@ public function __construct(
         $this->localeDate = $localeDate;
         $this->messageManager = $messageManager ?: ObjectManager::getInstance()
             ->get(ManagerInterface::class);
-        $this->sourceFactory = $sourceFactory?? ObjectManager::getInstance()
-            ->get(SourceFactory::class);
         $this->upload = $upload ?: ObjectManager::getInstance()
             ->get(Upload::class);
         parent::__construct($logger, $filesystem, $data);
@@ -313,6 +304,7 @@ protected function _getEntityAdapter()
 
     /**
      * Returns source adapter object.
+     *
      * @Deprecated
      * @see \Magento\ImportExport\Model\Import\Source\Factory::create()
      * @param string $sourceFile Full path to source file
@@ -584,11 +576,7 @@ public function uploadFileAndGetSource()
     {
         $sourceFile = $this->uploadSource();
         try {
-            $source = $this->sourceFactory->create(
-                $sourceFile,
-                $this->_filesystem->getDirectoryWrite(DirectoryList::ROOT),
-                $this->getData(self::FIELD_FIELD_SEPARATOR)
-            );
+            $source = $this->_getSourceAdapter($sourceFile);
         } catch (\Exception $e) {
             $this->_varDirectory->delete($this->_varDirectory->getRelativePath($sourceFile));
             throw new LocalizedException(__($e->getMessage()));

app/code/Magento/ImportExport/Model/Import/Source/Factory.php

@@ -8,29 +8,36 @@
 
 namespace Magento\ImportExport\Model\Import\Source;
 
+use Magento\Framework\Filesystem\Directory\Write;
 use Magento\Framework\ObjectManagerInterface;
 use Magento\ImportExport\Model\Import\AbstractSource;
 
 class Factory
 {
     /**
-     * Object Manager
+     * Object Manager Instance
      *
      * @var \Magento\Framework\ObjectManagerInterface
      */
     private $objectManager;
 
+    /**
+     * @param ObjectManagerInterface $objectManager
+     */
     public function __construct(
         ObjectManagerInterface $objectManager
     ) {
         $this->objectManager = $objectManager;
     }
 
     /**
-     * @param $source
-     * @param $directory
-     * @param $options
+     * Create class instance with specified parameters
+     *
+     * @param string $source
+     * @param Write $directory
+     * @param mixed $options
      * @return AbstractSource
+     * @phpcs:disable Magento2.Functions.DiscouragedFunction
      * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function create($source, $directory = null, $options = null): AbstractSource

app/code/Magento/ImportExport/Test/Unit/Helper/ReportTest.php

@@ -204,7 +204,6 @@ public function testGetSummaryStats()
         $importHistoryModel = $this->createMock(History::class);
         $localeDate = $this->createMock(\Magento\Framework\Stdlib\DateTime\DateTime::class);
         $upload = $this->createMock(Upload::class);
-        $sourceFactoryMock = $this->createMock(\Magento\ImportExport\Model\Import\Source\Factory::class);
         $import = new Import(
             $logger,
             $filesystem,
@@ -222,7 +221,6 @@ public function testGetSummaryStats()
             $localeDate,
             [],
             null,
-            $sourceFactoryMock,
             $upload
         );
         $import->setData('entity', 'catalog_product');

app/code/Magento/ImportExport/Test/Unit/Model/ImportTest.php

@@ -231,7 +231,6 @@ protected function setUp(): void
             ->expects($this->any())
             ->method('getDriver')
             ->willReturn($this->_driver);
-        $sourceFactoryMock = $this->createMock(\Magento\ImportExport\Model\Import\Source\Factory::class);
         $this->upload = $this->createMock(Upload::class);
         $this->import = $this->getMockBuilder(Import::class)
             ->setConstructorArgs(
@@ -252,7 +251,6 @@ protected function setUp(): void
                     $this->dateTime,
                     [],
                     null,
-                    $sourceFactoryMock,
                     $this->upload
                 ]
             )