Updated MediaGallery modules and marked as API

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

@@ -10,123 +10,199 @@
 
 use Magento\MediaGalleryApi\Api\Data\AssetExtensionInterface;
 use Magento\MediaGalleryApi\Api\Data\AssetInterface;
-use Magento\Framework\Model\AbstractExtensibleModel;
 
 /**
  * Media Gallery Asset
  */
-class Asset extends AbstractExtensibleModel implements AssetInterface
+class Asset implements AssetInterface
 {
-    private const ID = 'id';
-    private const PATH = 'path';
-    private const TITLE = 'title';
-    private const SOURCE = 'source';
-    private const CONTENT_TYPE = 'content_type';
-    private const WIDTH = 'width';
-    private const HEIGHT = 'height';
-    private const SIZE = 'size';
-    private const CREATED_AT = 'created_at';
-    private const UPDATED_AT = 'updated_at';
+    /**
+     * @var int|null
+     */
+    private $id;
+
+    /**
+     * @var string
+     */
+    private $path;
+
+    /**
+     * @var string|null
+     */
+    private $title;
+
+    /**
+     * @var string|null
+     */
+    private $source;
+
+    /**
+     * @var string
+     */
+    private $contentType;
+
+    /**
+     * @var int
+     */
+    private $width;
+
+    /**
+     * @var int
+     */
+    private $height;
+
+    /**
+     * @var int
+     */
+    private $size;
+
+    /**
+     * @var string|null
+     */
+    private $createdAt;
+
+    /**
+     * @var string|null
+     */
+    private $updatedAt;
+
+    /**
+     * @var AssetExtensionInterface|null
+     */
+    private $extensionAttributes;
+
+    /**
+     * @param string $path
+     * @param string $contentType
+     * @param int $width
+     * @param int $height
+     * @param int $size
+     * @param int|null $id
+     * @param string|null $title
+     * @param string|null $source
+     * @param string|null $createdAt
+     * @param string|null $updatedAt
+     * @param AssetExtensionInterface|null $extensionAttributes
+     */
+    public function __construct(
+        string $path,
+        string $contentType,
+        int $width,
+        int $height,
+        int $size,
+        ?int $id = null,
+        ?string $title = null,
+        ?string $source = null,
+        ?string $createdAt = null,
+        ?string $updatedAt = null,
+        ?AssetExtensionInterface $extensionAttributes = null
+    ) {
+        $this->path = $path;
+        $this->contentType = $contentType;
+        $this->width = $width;
+        $this->height = $height;
+        $this->size = $size;
+        $this->id = $id;
+        $this->title = $title;
+        $this->source = $source;
+        $this->createdAt = $createdAt;
+        $this->updatedAt = $updatedAt;
+        $this->extensionAttributes = $extensionAttributes;
+    }
 
     /**
      * @inheritdoc
      */
     public function getId(): ?int
     {
-        $id = $this->getData(self::ID);
-
-        if (!$id) {
-            return null;
-        }
-
-        return (int) $id;
+        return $this->id;
     }
 
     /**
      * @inheritdoc
      */
     public function getPath(): string
     {
-        return (string) $this->getData(self::PATH);
+        return $this->path;
     }
 
     /**
      * @inheritdoc
      */
     public function getTitle(): ?string
     {
-        return $this->getData(self::TITLE);
+        return $this->title;
     }
 
     /**
      * @inheritdoc
      */
     public function getSource(): ?string
     {
-        return $this->getData(self::SOURCE);
+        return $this->source;
     }
 
     /**
      * @inheritdoc
      */
     public function getContentType(): string
     {
-        return (string) $this->getData(self::CONTENT_TYPE);
+        return $this->contentType;
     }
 
     /**
      * @inheritdoc
      */
     public function getWidth(): int
     {
-        return (int) $this->getData(self::WIDTH);
+        return $this->width;
     }
 
     /**
      * @inheritdoc
      */
     public function getHeight(): int
     {
-        return (int) $this->getData(self::HEIGHT);
+        return $this->height;
     }
 
     /**
      * @inheritdoc
      */
     public function getSize(): int
     {
-        return (int) $this->getData(self::SIZE);
+        return $this->size;
     }
 
     /**
      * @inheritdoc
      */
-    public function getCreatedAt(): string
+    public function getCreatedAt(): ?string
     {
-        return (string) $this->getData(self::CREATED_AT);
+        return $this->createdAt;
     }
 
     /**
      * @inheritdoc
      */
-    public function getUpdatedAt(): string
+    public function getUpdatedAt(): ?string
     {
-        return (string) $this->getData(self::UPDATED_AT);
+        return $this->updatedAt;
     }
 
     /**
      * @inheritdoc
      */
-    public function getExtensionAttributes(): AssetExtensionInterface
+    public function getExtensionAttributes(): ?AssetExtensionInterface
     {
-        return $this->_getExtensionAttributes();
+        return $this->extensionAttributes;
     }
 
     /**
      * @inheritdoc
      */
-    public function setExtensionAttributes(AssetExtensionInterface $extensionAttributes): void
+    public function setExtensionAttributes(?AssetExtensionInterface $extensionAttributes): void
     {
-        $this->_setExtensionAttributes($extensionAttributes);
+        $this->extensionAttributes = $extensionAttributes;
     }
 }

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

@@ -14,9 +14,9 @@
 use Psr\Log\LoggerInterface;
 
 /**
- * Class DeleteByDirectoryPath
- *
  * Remove asset(s) that correspond the provided directory path
+ * @deprecated use \Magento\MediaGalleryApi\Api\DeleteAssetsByPathInterface instead
+ * @see \Magento\MediaGalleryApi\Api\DeleteAssetsByPathInterfac
  */
 class DeleteByDirectoryPath implements DeleteByDirectoryPathInterface
 {

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

@@ -14,7 +14,10 @@
 use Psr\Log\LoggerInterface;
 
 /**
- * Class DeleteByPath
+ * Delete media asset by path
+ *
+ * @deprecated use \Magento\MediaGalleryApi\Api\DeleteAssetsByPathInterface instead
+ * @see \Magento\MediaGalleryApi\Api\DeleteAssetsByPathInterface
  */
 class DeleteByPath implements DeleteByPathInterface
 {

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

@@ -16,7 +16,9 @@
 use Psr\Log\LoggerInterface;
 
 /**
- * Class GetById
+ * Get media asset by id
+ * @deprecated use \Magento\MediaGalleryApi\Api\GetAssetsByIdsInterface instead
+ * @see \Magento\MediaGalleryApi\Api\GetAssetsByIdsInterface
  */
 class GetById implements GetByIdInterface
 {
@@ -28,7 +30,7 @@ class GetById implements GetByIdInterface
     private $resourceConnection;
 
     /**
-     * @var AssetInterface
+     * @var AssetInterfaceFactory
      */
     private $assetFactory;
 
@@ -87,7 +89,20 @@ public function execute(int $mediaAssetId): AssetInterface
         }
 
         try {
-            return $this->assetFactory->create(['data' => $mediaAssetData]);
+            return $this->assetFactory->create(
+                [
+                    'id' => $mediaAssetData['id'],
+                    'path' => $mediaAssetData['path'],
+                    'title' => $mediaAssetData['title'],
+                    'source' => $mediaAssetData['source'],
+                    'contentType' => $mediaAssetData['content_type'],
+                    'width' => $mediaAssetData['width'],
+                    'height' => $mediaAssetData['height'],
+                    'size' => $mediaAssetData['size'],
+                    'createdAt' => $mediaAssetData['created_at'],
+                    'updatedAt' => $mediaAssetData['updated_at'],
+                ]
+            );
         } catch (\Exception $exception) {
             $this->logger->critical($exception);
             $message = __(

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

@@ -16,7 +16,10 @@
 use Psr\Log\LoggerInterface;
 
 /**
- * Class GetListByIds
+ * Provide media asset by path
+ *
+ * @deprecated use \Magento\MediaGalleryApi\Api\GetAssetsByPathsInterface instead
+ * @see \Magento\MediaGalleryApi\Api\GetAssetsByPathsInterface
  */
 class GetByPath implements GetByPathInterface
 {
@@ -30,7 +33,7 @@ class GetByPath implements GetByPathInterface
     private $resourceConnection;
 
     /**
-     * @var AssetInterface
+     * @var AssetInterfaceFactory
      */
     private $mediaAssetFactory;
 
@@ -57,30 +60,41 @@ public function __construct(
     }
 
     /**
-     * Return media asset asset list
+     * Return media asset
      *
-     * @param string $mediaFilePath
+     * @param string $path
      *
      * @return AssetInterface
      * @throws IntegrationException
      */
-    public function execute(string $mediaFilePath): AssetInterface
+    public function execute(string $path): AssetInterface
     {
         try {
             $connection = $this->resourceConnection->getConnection();
             $select = $connection->select()
                 ->from($this->resourceConnection->getTableName(self::TABLE_MEDIA_GALLERY_ASSET))
-                ->where(self::MEDIA_GALLERY_ASSET_PATH . ' = ?', $mediaFilePath);
+                ->where(self::MEDIA_GALLERY_ASSET_PATH . ' = ?', $path);
             $data = $connection->query($select)->fetch();
 
             if (empty($data)) {
-                $message = __('There is no such media asset with path "%1"', $mediaFilePath);
+                $message = __('There is no such media asset with path "%1"', $path);
                 throw new NoSuchEntityException($message);
             }
 
-            $mediaAssets = $this->mediaAssetFactory->create(['data' => $data]);
-
-            return $mediaAssets;
+            return $this->mediaAssetFactory->create(
+                [
+                    'id' => $data['id'],
+                    'path' => $data['path'],
+                    'title' => $data['title'],
+                    'source' => $data['source'],
+                    'contentType' => $data['content_type'],
+                    'width' => $data['width'],
+                    'height' => $data['height'],
+                    'size' => $data['size'],
+                    'createdAt' => $data['created_at'],
+                    'updatedAt' => $data['updated_at'],
+                ]
+            );
         } catch (\Exception $exception) {
             $this->logger->critical($exception);
             $message = __('An error occurred during get media asset list: %1', $exception->getMessage());