B2B-1789: First Request For Storefront Image After Deleting Local File System Cached Images Results In Magento Placeholder Image When Using S3 -

Added review changes

Author: avattam06

app/code/Magento/RemoteStorage/Model/File/Storage/SynchronizationFactory.php renamed to app/code/Magento/RemoteStorage/Plugin/MediaStorage.php

@@ -5,17 +5,18 @@
  */
 declare(strict_types=1);
 
-namespace Magento\RemoteStorage\Model\File\Storage;
+namespace Magento\RemoteStorage\Plugin;
 
-use Magento\Framework\ObjectManagerInterface;
+use Magento\RemoteStorage\Model\File\Storage\Synchronization;
 use Magento\RemoteStorage\Model\Config;
+use Magento\Framework\ObjectManagerInterface;
 
 /**
- * Factory class for @see \Magento\RemoteStorage\Model\File\Storage\Synchronization
+ * Helps to synchronize files from remote to local file system
  */
-class SynchronizationFactory extends \Magento\MediaStorage\Model\File\Storage\SynchronizationFactory
+class MediaStorage
 {
-    /**
+     /**
      * Object Manager instance
      *
      * @var ObjectManagerInterface
@@ -37,22 +38,17 @@ public function __construct(ObjectManagerInterface $objectManager, Config $confi
     {
         $this->objectManager = $objectManager;
         $this->config = $config;
-        parent::__construct($objectManager);
     }
 
     /**
      * Create class instance with specified parameters
      *
      * @param array $data
-     * @return \Magento\MediaStorage\Model\File\Storage\Synchronization|mixed
-     * @throws \Magento\Framework\Exception\FileSystemException
-     * @throws \Magento\Framework\Exception\RuntimeException
      */
-    public function create(array $data = [])
+    public function aroundCreate(array $data = [])
     {
         if ($this->config->isEnabled()) {
             return $this->objectManager->create(Synchronization::class, $data);
         }
-        return parent::create($data);
     }
 }

app/code/Magento/RemoteStorage/composer.json

@@ -3,15 +3,15 @@
     "description": "N/A",
     "require": {
         "php": "~7.3.0||~7.4.0",
-        "magento/framework": "*",
-        "magento/module-media-storage": "*"
+        "magento/framework": "*"
     },
     "suggest": {
         "magento/module-backend": "*",
         "magento/module-sitemap": "*",
         "magento/module-cms": "*",
         "magento/module-downloadable": "*",
         "magento/module-catalog": "*",
+        "magento/module-media-storage": "*",
         "magento/module-import-export": "*",
         "magento/module-catalog-import-export": "*",
         "magento/module-downloadable-import-export": "*",

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

@@ -10,7 +10,6 @@
     <preference for="Magento\RemoteStorage\Driver\Adapter\CachedAdapterInterface" type="Magento\RemoteStorage\Driver\Adapter\CachedAdapter"/>
     <preference for="Magento\RemoteStorage\Driver\Adapter\MetadataProviderInterface" type="Magento\RemoteStorage\Driver\Adapter\MetadataProvider"/>
     <preference for="Magento\RemoteStorage\Driver\Adapter\MetadataProviderFactoryInterface" type="Magento\RemoteStorage\Driver\Adapter\MetadataProviderFactory"/>
-    <preference for="Magento\MediaStorage\Model\File\Storage\SynchronizationFactory" type="Magento\RemoteStorage\Model\File\Storage\SynchronizationFactory"/>
     <virtualType name="remoteWriteFactory" type="Magento\Framework\Filesystem\Directory\WriteFactory">
         <arguments>
             <argument name="driverPool" xsi:type="object">Magento\RemoteStorage\Driver\DriverPool</argument>
@@ -76,6 +75,9 @@
             <argument name="filesystem" xsi:type="object">fullRemoteFilesystem</argument>
         </arguments>
     </type>
+    <type name="Magento\MediaStorage\Model\File\Storage\SynchronizationFactory">
+        <plugin name="remoteMedia" type="Magento\RemoteStorage\Plugin\MediaStorage" />
+    </type>
     <type name="Magento\Framework\Data\Collection\Filesystem">
         <arguments>
             <argument name="filesystem" xsi:type="object">fullRemoteFilesystem</argument>