Migrate storate status code to storagenotavailablexception

diff --git a/apps/files_external/controller/storagescontroller.php b/apps/files_external/controller/storagescontroller.php
index 76096f76656e9d9721a8c73acc6b49ff5d23e59e..da17f76cc6411b7ffa4ed07116941f3173f8d155 100644 (file)
--- a/apps/files_external/controller/storagescontroller.php
+++ b/apps/files_external/controller/storagescontroller.php
@@ -38,6 +38,7 @@ use \OCA\Files_External\Lib\Auth\AuthMechanism;
 use \OCP\Files\StorageNotAvailableException;
 use \OCA\Files_External\Lib\InsufficientDataForMeaningfulAnswerException;
 use \OCA\Files_External\Service\BackendService;
+use \OCP\Files\StorageNotAvailableException;
 
 /**
  * Base class for storages controllers
@@ -238,7 +239,7 @@ abstract class StoragesController extends Controller {
                        );
                } catch (InsufficientDataForMeaningfulAnswerException $e) {
                        $storage->setStatus(
-                               \OC_Mount_Config::STATUS_INDETERMINATE,
+                               StorageNotAvailableException::STATUS_INDETERMINATE,
                                $this->l10n->t('Insufficient data: %s', [$e->getMessage()])
                        );
                } catch (StorageNotAvailableException $e) {
@@ -249,7 +250,7 @@ abstract class StoragesController extends Controller {
                } catch (\Exception $e) {
                        // FIXME: convert storage exceptions to StorageNotAvailableException
                        $storage->setStatus(
-                               \OC_Mount_Config::STATUS_ERROR,
+                               StorageNotAvailableException::STATUS_ERROR,
                                get_class($e).': '.$e->getMessage()
                        );
                }

diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php
index 1e96fac8145b8e5cae78236a96a51664ade698a2..7a869847a632bc3a211211e3627cb8946c587487 100644 (file)
--- a/apps/files_external/lib/config.php
+++ b/apps/files_external/lib/config.php
@@ -36,6 +36,7 @@ use \OCA\Files_External\Appinfo\Application;
 use \OCA\Files_External\Lib\Backend\LegacyBackend;
 use \OCA\Files_External\Lib\StorageConfig;
 use \OCA\Files_External\Lib\Backend\Backend;
+use \OCP\Files\StorageNotAvailableException;
 
 /**
  * Class to configure mount.json globally and for users
@@ -48,11 +49,6 @@ class OC_Mount_Config {
        const MOUNT_TYPE_USER = 'user';
        const MOUNT_TYPE_PERSONAL = 'personal';
 
-       // getBackendStatus return types
-       const STATUS_SUCCESS = 0;
-       const STATUS_ERROR = 1;
-       const STATUS_INDETERMINATE = 2;
-
        // whether to skip backend test (for unit tests, as this static class is not mockable)
        public static $skipTest = false;
 
@@ -219,7 +215,7 @@ class OC_Mount_Config {
         */
        public static function getBackendStatus($class, $options, $isPersonal) {
                if (self::$skipTest) {
-                       return self::STATUS_SUCCESS;
+                       return StorageNotAvailableException::STATUS_SUCCESS;
                }
                foreach ($options as &$option) {
                        $option = self::setUserVars(OCP\User::getUser(), $option);
@@ -233,7 +229,7 @@ class OC_Mount_Config {
                                        $result = $storage->test($isPersonal);
                                        $storage->setAvailability($result);
                                        if ($result) {
-                                               return self::STATUS_SUCCESS;
+                                               return StorageNotAvailableException::STATUS_SUCCESS;
                                        }
                                } catch (\Exception $e) {
                                        $storage->setAvailability(false);
@@ -244,7 +240,7 @@ class OC_Mount_Config {
                                throw $exception;
                        }
                }
-               return self::STATUS_ERROR;
+               return StorageNotAvailableException::STATUS_ERROR;
        }
 
        /**

diff --git a/apps/files_external/service/storagesservice.php b/apps/files_external/service/storagesservice.php
index 3446ed0dab3d79d3c74b80777e4ed1f03fe88117..c847930ba2d247435c3cfed0807676e9f9a5002f 100644 (file)
--- a/apps/files_external/service/storagesservice.php
+++ b/apps/files_external/service/storagesservice.php
@@ -31,6 +31,7 @@ use \OCA\Files_external\NotFoundException;
 use \OCA\Files_External\Service\BackendService;
 use \OCA\Files_External\Lib\Backend\Backend;
 use \OCA\Files_External\Lib\Auth\AuthMechanism;
+use \OCP\Files\StorageNotAvailableException;
 
 /**
  * Service class to manage external storages
@@ -411,7 +412,7 @@ abstract class StoragesService {
 
                $this->triggerHooks($newStorage, Filesystem::signal_create_mount);
 
-               $newStorage->setStatus(\OC_Mount_Config::STATUS_SUCCESS);
+               $newStorage->setStatus(StorageNotAvailableException::STATUS_SUCCESS);
                return $newStorage;
        }
 

diff --git a/lib/public/files/storagenotavailableexception.php b/lib/public/files/storagenotavailableexception.php
index fe270e76b4ef927f6674629513e6fda18365645f..323f5d9b7f82937afa778f15e2468f12ec6d320f 100644 (file)
--- a/lib/public/files/storagenotavailableexception.php
+++ b/lib/public/files/storagenotavailableexception.php
@@ -37,6 +37,9 @@ use OC\HintException;
  */
 class StorageNotAvailableException extends HintException {
 
+       const STATUS_SUCCESS = 0;
+       const STATUS_ERROR = 1;
+       const STATUS_INDETERMINATE = 2;
        const STATUS_INCOMPLETE_CONF = 3;
        const STATUS_UNAUTHORIZED = 4;
        const STATUS_TIMEOUT = 5;