B2B-1610: Upgrade to Flysystem 2.0

- review notes fix.

Author: Roman Hanin

app/code/Magento/AwsS3/Driver/AwsS3.php

@@ -446,7 +446,7 @@ public function isDirectory($path): bool
         $path = $this->normalizeRelativePath($path, true);
 
         try {
-            return $this->isMetadataTypeDirectory($path);
+            return $this->isTypeDirectory($path);
         } catch (UnableToRetrieveMetadata $e) {
             try {
                 return iterator_count($this->adapter->listContents($path, false)) > 0;
@@ -464,7 +464,7 @@ public function isDirectory($path): bool
      * @return bool
      * @throws UnableToRetrieveMetadata
      */
-    private function isMetadataTypeDirectory($path)
+    private function isTypeDirectory($path)
     {
         $meta = $this->metadataProvider->getMetadata($path);
         if (isset($meta['type']) && $meta['type'] === self::TYPE_DIR) {

app/code/Magento/AwsS3/Driver/AwsS3Factory.php

@@ -13,7 +13,7 @@
 use Magento\Framework\ObjectManagerInterface;
 use Magento\RemoteStorage\Driver\Adapter\Cache\CacheInterfaceFactory;
 use Magento\RemoteStorage\Driver\Adapter\CachedAdapterInterfaceFactory;
-use Magento\RemoteStorage\Driver\Adapter\MetadataProviderFactoryInterface;
+use Magento\RemoteStorage\Driver\Adapter\MetadataProviderInterfaceFactory;
 use Magento\RemoteStorage\Driver\DriverException;
 use Magento\RemoteStorage\Driver\DriverFactoryInterface;
 use Magento\RemoteStorage\Driver\RemoteDriverInterface;
@@ -35,7 +35,7 @@ class AwsS3Factory implements DriverFactoryInterface
     private $config;
 
     /**
-     * @var MetadataProviderFactoryInterface
+     * @var MetadataProviderInterfaceFactory
      */
     private $metadataProviderFactory;
 
@@ -49,25 +49,33 @@ class AwsS3Factory implements DriverFactoryInterface
      */
     private $cachedAdapterInterfaceFactory;
 
+    /**
+     * @var string|null
+     */
+    private $cachePrefix;
+
     /**
      * @param ObjectManagerInterface $objectManager
      * @param Config $config
-     * @param MetadataProviderFactoryInterface $metadataProviderFactory
+     * @param MetadataProviderInterfaceFactory $metadataProviderFactory
      * @param CacheInterfaceFactory $cacheInterfaceFactory
      * @param CachedAdapterInterfaceFactory $cachedAdapterInterfaceFactory
+     * @param string|null $cachePrefix
      */
     public function __construct(
         ObjectManagerInterface $objectManager,
         Config $config,
-        MetadataProviderFactoryInterface $metadataProviderFactory,
+        MetadataProviderInterfaceFactory $metadataProviderFactory,
         CacheInterfaceFactory $cacheInterfaceFactory,
-        CachedAdapterInterfaceFactory $cachedAdapterInterfaceFactory
+        CachedAdapterInterfaceFactory $cachedAdapterInterfaceFactory,
+        string $cachePrefix = null
     ) {
         $this->objectManager = $objectManager;
         $this->config = $config;
         $this->metadataProviderFactory = $metadataProviderFactory;
         $this->cacheInterfaceFactory = $cacheInterfaceFactory;
         $this->cachedAdapterInterfaceFactory = $cachedAdapterInterfaceFactory;
+        $this->cachePrefix = $cachePrefix;
     }
 
     /**
@@ -110,17 +118,26 @@ public function createConfigured(
 
         $client = new S3Client($config);
         $adapter = new AwsS3V3Adapter($client, $config['bucket'], $prefix);
-        $cache = $this->cacheInterfaceFactory->create();
+        $cache = $this->cacheInterfaceFactory->create(
+            $this->cachePrefix ? ['prefix' => $this->cachePrefix] : []
+        );
 
         return $this->objectManager->create(
             AwsS3::class,
             [
-                'adapter' => $this->cachedAdapterInterfaceFactory->create([
-                    'adapter' => $adapter,
-                    'cache' => $cache
-                ]),
+                'adapter' => $this->cachedAdapterInterfaceFactory->create(
+                    [
+                        'adapter' => $adapter,
+                        'cache' => $cache
+                    ]
+                ),
                 'objectUrl' => $client->getObjectUrl($config['bucket'], trim($prefix, '\\/') . '/.'),
-                'metadataProvider' => $this->metadataProviderFactory->create($adapter, $cache),
+                'metadataProvider' => $this->metadataProviderFactory->create(
+                    [
+                        'adapter' => $adapter,
+                        'cache' => $cache
+                    ]
+                ),
             ]
         );
     }

app/code/Magento/RemoteStorage/Driver/Adapter/CachedAdapter.php

@@ -28,7 +28,7 @@ class CachedAdapter implements CachedAdapterInterface
     private $cache;
 
     /**
-     * @var MetadataProviderFactoryInterface
+     * @var MetadataProviderInterfaceFactory
      */
     private $metadataProviderFactory;
 
@@ -42,12 +42,12 @@ class CachedAdapter implements CachedAdapterInterface
      *
      * @param FilesystemAdapter $adapter
      * @param CacheInterface $cache
-     * @param MetadataProviderFactoryInterface $metadataProviderFactory
+     * @param MetadataProviderInterfaceFactory $metadataProviderFactory
      */
     public function __construct(
         FilesystemAdapter $adapter,
         CacheInterface $cache,
-        MetadataProviderFactoryInterface $metadataProviderFactory
+        MetadataProviderInterfaceFactory $metadataProviderFactory
     ) {
         $this->adapter = $adapter;
         $this->cache = $cache;
@@ -202,7 +202,12 @@ public function listContents(string $path, bool $deep): iterable
     private function getMetadata($path)
     {
         if (!$this->metadataProvider) {
-            $this->metadataProvider = $this->metadataProviderFactory->create($this->adapter, $this->cache);
+            $this->metadataProvider = $this->metadataProviderFactory->create(
+                [
+                    'adapter' => $this->adapter,
+                    'cache' => $this->cache
+                ]
+            );
         }
         return $this->metadataProvider->getMetadata($path);
     }

app/code/Magento/RemoteStorage/Driver/Adapter/MetadataProviderFactory.php

@@ -7,6 +7,8 @@
 
 namespace Magento\RemoteStorage\Driver\Adapter;
 
+use League\Flysystem\UnableToRetrieveMetadata;
+
 /**
  * Interface for metadata provider. Provides metadata of the file by given path.
  */
@@ -17,6 +19,7 @@ interface MetadataProviderInterface
      *
      * @param string $path
      * @return array
+     * @throws UnableToRetrieveMetadata
      */
     public function getMetadata(string $path): array;
 }