diff options
author | Bernhard Posselt <dev@bernhard-posselt.com> | 2014-04-06 15:26:45 +0200 |
---|---|---|
committer | Bernhard Posselt <dev@bernhard-posselt.com> | 2014-04-06 15:26:58 +0200 |
commit | dbd18a20993221baf9e851fbd8eba1a48c411b3d (patch) | |
tree | d6bb96ddde1d70e960e1e8fc7b3d2d8a1ce3ca79 /controller/foldercontroller.php | |
parent | 3c4044970e38820d67560e219dd94dc9e96b0387 (diff) |
get rid of deprecated getParams and renderJSON method to ease transition to built in appframework
Diffstat (limited to 'controller/foldercontroller.php')
-rw-r--r-- | controller/foldercontroller.php | 66 |
1 files changed, 49 insertions, 17 deletions
diff --git a/controller/foldercontroller.php b/controller/foldercontroller.php index 546ce60b6..09d226920 100644 --- a/controller/foldercontroller.php +++ b/controller/foldercontroller.php @@ -28,12 +28,15 @@ namespace OCA\News\Controller; use \OCA\AppFramework\Controller\Controller; use \OCA\AppFramework\Core\API; use \OCA\AppFramework\Http\Request; +use \OCA\AppFramework\Http\JSONResponse; +use \OCA\AppFramework\Http\Http; use \OCA\News\BusinessLayer\FolderBusinessLayer; use \OCA\News\BusinessLayer\FeedBusinessLayer; use \OCA\News\BusinessLayer\ItemBusinessLayer; use \OCA\News\BusinessLayer\BusinessLayerException; - +use \OCA\News\BusinessLayer\BusinessLayerConflictException; +use \OCA\News\BusinessLayer\BusinessLayerValidationException; class FolderController extends Controller { @@ -62,7 +65,7 @@ class FolderController extends Controller { $result = array( 'folders' => $folders ); - return $this->renderJSON($result); + return new JSONResponse($result); } @@ -82,9 +85,11 @@ class FolderController extends Controller { public function open(){ try { $this->setOpened(true); - return $this->renderJSON(); + return new JSONResponse(); } catch(BusinessLayerException $ex) { - return $this->renderJSON(array(), $ex->getMessage()); + return new JSONResponse(array( + 'msg' => $ex->getMessage() + ), Http::STATUS_NOT_FOUND); } } @@ -97,9 +102,11 @@ class FolderController extends Controller { public function collapse(){ try { $this->setOpened(false); - return $this->renderJSON(); + return new JSONResponse(); } catch(BusinessLayerException $ex) { - return $this->renderJSON(array(), $ex->getMessage()); + return new JSONResponse(array( + 'msg' => $ex->getMessage() + ), Http::STATUS_NOT_FOUND); } } @@ -123,10 +130,19 @@ class FolderController extends Controller { $params = array( 'folders' => array($folder) ); - return $this->renderJSON($params); + return new JSONResponse($params); - } catch (BusinessLayerException $ex){ - return $this->renderJSON(array(), $ex->getMessage()); + + + } catch(BusinessLayerConflictException $ex) { + return new JSONResponse(array( + 'msg' => $ex->getMessage() + ), Http::STATUS_CONFLICT); + + } catch(BusinessLayerValidationException $ex) { + return new JSONResponse(array( + 'msg' => $ex->getMessage() + ), Http::STATUS_UNPROCESSABLE_ENTITY); } } @@ -143,9 +159,11 @@ class FolderController extends Controller { try { $this->folderBusinessLayer->markDeleted($folderId, $userId); - return $this->renderJSON(); + return new JSONResponse(); } catch (BusinessLayerException $ex){ - return $this->renderJSON(array(), $ex->getMessage()); + return new JSONResponse(array( + 'msg' => $ex->getMessage() + ), Http::STATUS_NOT_FOUND); } } @@ -166,10 +184,22 @@ class FolderController extends Controller { $params = array( 'folders' => array($folder) ); - return $this->renderJSON($params); - + return new JSONResponse($params); + + } catch(BusinessLayerConflictException $ex) { + return new JSONResponse(array( + 'msg' => $ex->getMessage() + ), Http::STATUS_CONFLICT); + + } catch(BusinessLayerValidationException $ex) { + return new JSONResponse(array( + 'msg' => $ex->getMessage() + ), Http::STATUS_UNPROCESSABLE_ENTITY); + } catch (BusinessLayerException $ex){ - return $this->renderJSON(array(), $ex->getMessage()); + return new JSONResponse(array( + 'msg' => $ex->getMessage() + ), Http::STATUS_NOT_FOUND); } } @@ -188,7 +218,7 @@ class FolderController extends Controller { $params = array( 'feeds' => $this->feedBusinessLayer->findAll($userId) ); - return $this->renderJSON($params); + return new JSONResponse($params); } @@ -203,9 +233,11 @@ class FolderController extends Controller { try { $this->folderBusinessLayer->unmarkDeleted($folderId, $userId); - return $this->renderJSON(); + return new JSONResponse(); } catch (BusinessLayerException $ex){ - return $this->renderJSON(array(), $ex->getMessage()); + return new JSONResponse(array( + 'msg' => $ex->getMessage() + ), Http::STATUS_NOT_FOUND); } } |