#27499: Removed DataExtractor in favour to DataObjectProcessor

Author: sivaschenko

app/code/Magento/MediaGallery/Model/Asset/Command/Save.php

@@ -7,11 +7,11 @@
 
 namespace Magento\MediaGallery\Model\Asset\Command;
 
-use Magento\MediaGalleryApi\Model\DataExtractorInterface;
 use Magento\MediaGalleryApi\Api\Data\AssetInterface;
 use Magento\MediaGalleryApi\Model\Asset\Command\SaveInterface;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Exception\CouldNotSaveException;
+use Magento\Framework\Reflection\DataObjectProcessor;
 use Psr\Log\LoggerInterface;
 
 /**
@@ -27,9 +27,9 @@ class Save implements SaveInterface
     private $resourceConnection;
 
     /**
-     * @var DataExtractorInterface
+     * @var DataObjectProcessor
      */
-    private $extractor;
+    private $objectProcessor;
 
     /**
      * @var LoggerInterface
@@ -40,16 +40,16 @@ class Save implements SaveInterface
      * Save constructor.
      *
      * @param ResourceConnection $resourceConnection
-     * @param DataExtractorInterface $extractor
+     * @param DataObjectProcessor $objectProcessor
      * @param LoggerInterface $logger
      */
     public function __construct(
         ResourceConnection $resourceConnection,
-        DataExtractorInterface $extractor,
+        DataObjectProcessor $objectProcessor,
         LoggerInterface $logger
     ) {
         $this->resourceConnection = $resourceConnection;
-        $this->extractor = $extractor;
+        $this->objectProcessor = $objectProcessor;
         $this->logger = $logger;
     }
 
@@ -68,7 +68,10 @@ public function execute(AssetInterface $mediaAsset): int
             $connection = $this->resourceConnection->getConnection();
             $tableName = $this->resourceConnection->getTableName(self::TABLE_MEDIA_GALLERY_ASSET);
 
-            $connection->insertOnDuplicate($tableName, $this->extractor->extract($mediaAsset, AssetInterface::class));
+            $connection->insertOnDuplicate(
+                $tableName,
+                array_filter($this->objectProcessor->buildOutputDataArray($mediaAsset, AssetInterface::class))
+            );
             return (int) $connection->lastInsertId($tableName);
         } catch (\Exception $exception) {
             $this->logger->critical($exception);

app/code/Magento/MediaGallery/Model/DataExtractor.php

@@ -7,16 +7,17 @@
 
 namespace Magento\MediaGallery\Test\Unit\Model\Asset\Command;
 
+use Magento\Eav\Helper\Data;
 use Magento\MediaGallery\Model\Asset\Command\Save;
 use Magento\MediaGalleryApi\Api\Data\AssetInterface;
-use Magento\MediaGalleryApi\Model\DataExtractorInterface;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\DB\Adapter\AdapterInterface;
 use Magento\Framework\DB\Adapter\Pdo\Mysql;
 use Magento\Framework\Exception\CouldNotSaveException;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
+use Magento\Framework\Reflection\DataObjectProcessor;
 use Psr\Log\LoggerInterface;
 
 /**
@@ -63,14 +64,14 @@ class SaveTest extends TestCase
     private $resourceConnectionMock;
 
     /**
-     * @var MockObject | DataExtractorInterface
+     * @var MockObject | LoggerInterface
      */
     private $loggerMock;
 
     /**
-     * @var MockObject | LoggerInterface
+     * @var MockObject | DataObjectProcessor
      */
-    private $extractorMock;
+    private $objectProcessor;
 
     /**
      * @var MockObject | AdapterInterface
@@ -97,7 +98,7 @@ protected function setUp(): void
         $this->mediaAssetMock = $this->createMock(AssetInterface::class);
 
         /* Save constructor mocks */
-        $this->extractorMock = $this->createMock(DataExtractorInterface::class);
+        $this->objectProcessor = $this->createMock(DataObjectProcessor::class);
         $this->loggerMock = $this->createMock(LoggerInterface::class);
         $this->resourceConnectionMock = $this->createConfiguredMock(
             ResourceConnection::class,
@@ -112,7 +113,7 @@ protected function setUp(): void
             Save::class,
             [
                 'resourceConnection' => $this->resourceConnectionMock,
-                'extractor'          => $this->extractorMock,
+                'objectProcessor'          => $this->objectProcessor,
                 'logger'             => $this->loggerMock
             ]
         );
@@ -126,9 +127,9 @@ public function testSuccessfulExecute(): void
         $this->resourceConnectionMock->expects(self::once())->method('getConnection');
         $this->resourceConnectionMock->expects(self::once())->method('getTableName');
 
-        $this->extractorMock
+        $this->objectProcessor
             ->expects(self::once())
-            ->method('extract')
+            ->method('buildOutputDataArray')
             ->with($this->mediaAssetMock, AssetInterface::class)
             ->willReturn(self::IMAGE_DATA);
 
@@ -155,9 +156,9 @@ public function testExceptionExecute(): void
         $this->resourceConnectionMock->expects(self::once())->method('getConnection');
         $this->resourceConnectionMock->expects(self::once())->method('getTableName');
 
-        $this->extractorMock
+        $this->objectProcessor
             ->expects(self::once())
-            ->method('extract')
+            ->method('buildOutputDataArray')
             ->with($this->mediaAssetMock, AssetInterface::class)
             ->willReturn(self::IMAGE_DATA);
 

app/code/Magento/MediaGallery/Test/Unit/Model/Asset/Command/SaveTest.php

@@ -19,8 +19,6 @@
     <preference for="Magento\MediaGalleryApi\Model\Keyword\Command\SaveAssetKeywordsInterface" type="Magento\MediaGallery\Model\Keyword\Command\SaveAssetKeywords"/>
     <preference for="Magento\MediaGalleryApi\Model\Keyword\Command\SaveAssetLinksInterface" type="Magento\MediaGallery\Model\Keyword\Command\SaveAssetLinks"/>
 
-    <preference for="Magento\MediaGalleryApi\Model\DataExtractorInterface" type="Magento\MediaGallery\Model\DataExtractor"/>
-
     <preference for="Magento\MediaGalleryApi\Model\Directory\Command\CreateByPathInterface" type="Magento\MediaGallery\Model\Directory\Command\CreateByPath"/>
     <preference for="Magento\MediaGalleryApi\Model\Directory\Command\DeleteByPathInterface" type="Magento\MediaGallery\Model\Directory\Command\DeleteByPath"/>