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

Added new sync for remote storage

Author: avattam06

app/code/Magento/MediaStorage/Model/File/Storage/Synchronization.php

@@ -8,9 +8,6 @@
 use Magento\Framework\Exception\FileSystemException;
 use Magento\Framework\Filesystem\Directory\WriteInterface as DirectoryWrite;
 use Magento\Framework\Filesystem\File\WriteInterface;
-use Magento\MediaStorage\Service\ImageResize;
-use Magento\MediaStorage\Model\File\Storage\Database;
-
 /**
  * Class Synchronization
  */

app/code/Magento/MediaStorage/Model/File/Storage/SynchronizationFactory.php

@@ -0,0 +1,47 @@
+<?php
+namespace Magento\MediaStorage\Model\File\Storage;
+
+use Magento\Framework\ObjectManagerInterface;
+
+/**
+ * Factory class for @see \Magento\MediaStorage\Model\File\Storage\Synchronization
+ */
+class SynchronizationFactory
+{
+    /**
+     * Object Manager instance
+     *
+     * @var ObjectManagerInterface
+     */
+    protected $_objectManager = null;
+
+    /**
+     * Instance name to create
+     *
+     * @var string
+     */
+    protected $_instanceName = null;
+
+    /**
+     * Factory constructor
+     *
+     * @param ObjectManagerInterface $objectManager
+     * @param string $instanceName
+     */
+    public function __construct(ObjectManagerInterface $objectManager, string $instanceName = '\\Magento\\MediaStorage\\Model\\File\\Storage\\Synchronization')
+    {
+        $this->_objectManager = $objectManager;
+        $this->_instanceName = $instanceName;
+    }
+
+    /**
+     * Create class instance with specified parameters
+     *
+     * @param array $data
+     * @return Synchronization
+     */
+    public function create(array $data = []): Synchronization
+    {
+        return $this->_objectManager->create($this->_instanceName, $data);
+    }
+}

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

@@ -3,25 +3,21 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-declare(strict_types=1);
-
-namespace Magento\RemoteStorage\Plugin;
+namespace Magento\RemoteStorage\Model\File\Storage;
 
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Exception\FileSystemException;
 use Magento\Framework\Exception\RuntimeException;
-use Magento\Framework\Exception\ValidatorException;
 use Magento\Framework\Filesystem\Directory\WriteInterface;
-use Magento\MediaStorage\Model\File\Storage\Synchronization;
 use Magento\RemoteStorage\Driver\DriverPool as RemoteDriverPool;
 use Magento\Framework\Filesystem\DriverPool as LocalDriverPool;
 use Magento\RemoteStorage\Model\Config;
 use Magento\RemoteStorage\Filesystem;
 
 /**
- * Modifies the base URL.
+ * Class Synchronization
  */
-class MediaStorage
+class Synchronization
 {
     /**
      * @var bool
@@ -52,16 +48,13 @@ public function __construct(Config $config, Filesystem $filesystem)
     }
 
     /**
-     * Download remote file
+     * Synchronize file
      *
-     * @param Synchronization $subject
      * @param string $relativeFileName
-     * @return null
-     * @throws FileSystemException
-     * @throws ValidatorException
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @return void
+     * @throws \LogicException
      */
-    public function beforeSynchronize(Synchronization $subject, string $relativeFileName): void
+    public function synchronize($relativeFileName)
     {
         if ($this->isEnabled && $this->remoteDirectory->isExist($relativeFileName)) {
             $file = $this->localDirectory->openFile($relativeFileName, 'w');

app/code/Magento/RemoteStorage/Model/File/Storage/SynchronizationFactory.php

@@ -0,0 +1,32 @@
+<?php
+namespace Magento\RemoteStorage\Model\File\Storage;
+
+use Magento\RemoteStorage\Model\Config;
+/**
+ * Factory class for @see \Magento\RemoteStorage\Model\File\Storage\Synchronization
+ */
+class SynchronizationFactory extends \Magento\MediaStorage\Model\File\Storage\SynchronizationFactory
+{
+    /**
+     * @var bool
+     */
+    private $isEnabled;
+
+    /**
+     * Factory constructor
+     *
+     * @param Config $config
+     */
+    public function __construct( Config $config)
+    {
+        $this->isEnabled = $config->isEnabled();
+    }
+
+    public function create(array $data = [])
+    {
+        if ($this->isEnabled) {
+            return $this->_objectManager->create(Synchronization::class, $data);
+        }
+        return parent::create($data);
+    }
+}

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

@@ -10,6 +10,7 @@
     <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>
@@ -75,9 +76,6 @@
             <argument name="filesystem" xsi:type="object">fullRemoteFilesystem</argument>
         </arguments>
     </type>
-    <type name="Magento\MediaStorage\Model\File\Storage\Synchronization">
-        <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>