magento/adobe-stock-integration#1806: remove unnecessary interface, after review fixes

Author: Viktor Kopin

app/code/Magento/MediaGalleryUi/Controller/Adminhtml/Image/OnInsert.php

@@ -13,7 +13,7 @@
 use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Framework\Controller\Result\JsonFactory;
 use Magento\Framework\Controller\ResultInterface;
-use Magento\MediaGalleryUiApi\Api\GetInsertImageDataInterface;
+use Magento\MediaGalleryUi\Model\InsertImageData\GetInsertImageData;
 
 /**
  * OnInsert action returns on insert image details
@@ -31,19 +31,19 @@ class OnInsert extends Action implements HttpPostActionInterface
     private $resultJsonFactory;
 
     /**
-     * @var GetInsertImageDataInterface
+     * @var GetInsertImageData
      */
     private $getInsertImageData;
 
     /**
      * @param Context $context
      * @param JsonFactory $resultJsonFactory
-     * @param GetInsertImageDataInterface|null $getInsertImageData
+     * @param GetInsertImageData $getInsertImageData
      */
     public function __construct(
         Context $context,
         JsonFactory $resultJsonFactory,
-        GetInsertImageDataInterface $getInsertImageData
+        GetInsertImageData $getInsertImageData
     ) {
         parent::__construct($context);
         $this->resultJsonFactory = $resultJsonFactory;

app/code/Magento/MediaGalleryUi/Model/InsertImageData.php

@@ -8,8 +8,7 @@
 
 namespace Magento\MediaGalleryUi\Model;
 
-use Magento\MediaGalleryUiApi\Api\Data\InsertImageDataInterface;
-use Magento\MediaGalleryUiApi\Api\InsertImageDataExtensionInterface;
+use Magento\MediaGalleryUi\Model\InsertImageDataExtensionInterface;
 
 /**
  * Class responsible to provide insert image details
@@ -83,7 +82,7 @@ public function getType(): string
     /**
      * Get extension attributes
      *
-     * @return ?\Magento\MediaGalleryUiApi\Api\InsertImageDataExtensionInterface;|null
+     * @return \Magento\MediaGalleryUi\Model\InsertImageDataExtensionInterface|null
      */
     public function getExtensionAttributes(): ?InsertImageDataExtensionInterface
     {
@@ -93,10 +92,10 @@ public function getExtensionAttributes(): ?InsertImageDataExtensionInterface
     /**
      * Set extension attributes
      *
-     * @param ?\Magento\MediaGalleryUiApi\Api\InsertImageDataExtensionInterface;|null $extensionAttributes
+     * @param \Magento\MediaGalleryUi\Model\InsertImageDataExtensionInterface $extensionAttributes
      * @return void
      */
-    public function setExtensionAttributes(?InsertImageDataExtensionInterface $extensionAttributes): void
+    public function setExtensionAttributes(InsertImageDataExtensionInterface $extensionAttributes): void
     {
         $this->extensionAttributes = $extensionAttributes;
     }

app/code/Magento/MediaGalleryUi/Model/InsertImageData/GetInsertImageData.php

@@ -14,10 +14,9 @@
 use Magento\Framework\Filesystem;
 use Magento\Framework\Filesystem\Directory\ReadInterface;
 use Magento\MediaGalleryUi\Model\InsertImageDataFactory;
-use Magento\MediaGalleryUiApi\Api\Data\InsertImageDataInterface;
-use Magento\MediaGalleryUiApi\Api\GetInsertImageDataInterface;
+use Magento\MediaGalleryUi\Model\InsertImageDataInterface;
 
-class GetInsertImageData implements GetInsertImageDataInterface
+class GetInsertImageData
 {
     /**
      * @var ReadInterface
@@ -115,9 +114,9 @@ private function getSize(string $path): int
      */
     public function getType(string $path): string
     {
-        $absoluteFilePath = $this->getPubDirectory()->getAbsolutePath($path);
+        $fileExist = $this->getPubDirectory()->isExist($path);
 
-        return $this->getPubDirectory()->isExist($path) ? $this->mime->getMimeType($absoluteFilePath) : '';
+        return $fileExist ? $this->mime->getMimeType($this->getPubDirectory()->getAbsolutePath($path)) : '';
     }
 
     /**

app/code/Magento/MediaGalleryUiApi/Api/Data/InsertImageDataInterface.php renamed to app/code/Magento/MediaGalleryUi/Model/InsertImageDataInterface.php

@@ -6,7 +6,7 @@
 
 declare(strict_types=1);
 
-namespace Magento\MediaGalleryUiApi\Api\Data;
+namespace Magento\MediaGalleryUi\Model;
 
 use Magento\Framework\Api\ExtensibleDataInterface;
 
@@ -39,17 +39,17 @@ public function getType(): string;
     /**
      * Get extension attributes
      *
-     * @return \Magento\MediaGalleryUiApi\Api\InsertImageDataExtensionInterface|null
+     * @return \Magento\MediaGalleryUi\Model\InsertImageDataExtensionInterface|null
      */
-    public function getExtensionAttributes(): ?\Magento\MediaGalleryUiApi\Api\InsertImageDataExtensionInterface;
+    public function getExtensionAttributes(): ?\Magento\MediaGalleryUi\Model\InsertImageDataExtensionInterface;
 
     /**
      * Set extension attributes
      *
-     * @param \Magento\MediaGalleryUiApi\Api\InsertImageDataExtensionInterface|null $extensionAttributes
+     * @param \Magento\MediaGalleryUi\Model\InsertImageDataExtensionInterface $extensionAttributes
      * @return void
      */
     public function setExtensionAttributes(
-        ?\Magento\MediaGalleryUiApi\Api\InsertImageDataExtensionInterface $extensionAttributes
+        \Magento\MediaGalleryUi\Model\InsertImageDataExtensionInterface $extensionAttributes
     ): void;
 }

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

@@ -7,7 +7,6 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
     <preference for="Magento\MediaGalleryUiApi\Api\ConfigInterface" type="Magento\MediaGalleryUi\Model\Config"/>
-    <preference for="Magento\MediaGalleryUiApi\Api\GetInsertImageDataInterface" type="\Magento\MediaGalleryUi\Model\InsertImageData\GetInsertImageData"/>
     <preference for="Magento\MediaGalleryUiApi\Api\Data\InsertImageDataInterface" type="\Magento\MediaGalleryUi\Model\InsertImageData"/>
     <type name="Magento\Framework\View\Element\UiComponent\DataProvider\CollectionFactory">
         <arguments>