diff options
author | Bernhard Posselt <nukeawhale@gmail.com> | 2013-06-12 20:17:46 +0200 |
---|---|---|
committer | Bernhard Posselt <nukeawhale@gmail.com> | 2013-06-12 20:32:49 +0200 |
commit | 836c65b6fa7e9a90f9baf421713641dfcb7a90aa (patch) | |
tree | 7b2607449517e22a88ef4003790f4b05270b6444 /external | |
parent | a5fea1be13b5915e60e10bccfd39e60110a56bca (diff) |
move to new restful api
Diffstat (limited to 'external')
-rw-r--r-- | external/feedapi.php | 28 | ||||
-rw-r--r-- | external/folderapi.php | 28 | ||||
-rw-r--r-- | external/itemapi.php | 24 | ||||
-rw-r--r-- | external/newsapiresult.php | 40 |
4 files changed, 43 insertions, 77 deletions
diff --git a/external/feedapi.php b/external/feedapi.php index dc7e1781b..b9dad00d2 100644 --- a/external/feedapi.php +++ b/external/feedapi.php @@ -28,6 +28,8 @@ namespace OCA\News\External; use \OCA\AppFramework\Core\API; use \OCA\AppFramework\Controller\Controller; use \OCA\AppFramework\Http\Request; +use \OCA\AppFramework\Http\JSONResponse; +use \OCA\AppFramework\Http\Http; use \OCA\News\BusinessLayer\FeedBusinessLayer; use \OCA\News\BusinessLayer\FolderBusinessLayer; @@ -77,7 +79,7 @@ class FeedAPI extends Controller { $this->itemBusinessLayer->getNewestItemId($userId); } catch(BusinessLayerException $ex) {} - return new NewsAPIResult($result); + return new JSONResponse($result); } @@ -104,14 +106,14 @@ class FeedAPI extends Controller { $this->itemBusinessLayer->getNewestItemId($userId); } catch(BusinessLayerException $ex) {} - return new NewsAPIResult($result); + return new JSONResponse($result); } catch(BusinessLayerExistsException $ex) { - return new NewsAPIResult(null, NewsAPIResult::EXISTS_ERROR, - $ex->getMessage()); + return new JSONResponse(array('message' => $ex->getMessage()), + Http::STATUS_CONFLICT); } catch(BusinessLayerException $ex) { - return new NewsAPIResult(null, NewsAPIResult::NOT_FOUND_ERROR, - $ex->getMessage()); + return new JSONResponse(array('message' => $ex->getMessage()), + Http::STATUS_NOT_FOUND); } } @@ -127,10 +129,10 @@ class FeedAPI extends Controller { try { $this->feedBusinessLayer->delete($feedId, $userId); - return new NewsAPIResult(); + return new JSONResponse(); } catch(BusinessLayerException $ex) { - return new NewsAPIResult(null, NewsAPIResult::NOT_FOUND_ERROR, - $ex->getMessage()); + return new JSONResponse(array('message' => $ex->getMessage()), + Http::STATUS_NOT_FOUND); } } @@ -146,7 +148,7 @@ class FeedAPI extends Controller { $newestItemId = (int) $this->params('newestItemId'); $this->itemBusinessLayer->readFeed($feedId, $newestItemId, $userId); - return new NewsAPIResult(); + return new JSONResponse(); } @@ -162,10 +164,10 @@ class FeedAPI extends Controller { try { $this->feedBusinessLayer->move($feedId, $folderId, $userId); - return new NewsAPIResult(); + return new JSONResponse(); } catch(BusinessLayerException $ex) { - return new NewsAPIResult(null, NewsAPIResult::NOT_FOUND_ERROR, - $ex->getMessage()); + return new JSONResponse(array('message' => $ex->getMessage()), + Http::STATUS_NOT_FOUND); } } diff --git a/external/folderapi.php b/external/folderapi.php index 5b90eff9e..3a8b7ea6f 100644 --- a/external/folderapi.php +++ b/external/folderapi.php @@ -28,6 +28,8 @@ namespace OCA\News\External; use \OCA\AppFramework\Core\API; use \OCA\AppFramework\Controller\Controller; use \OCA\AppFramework\Http\Request; +use \OCA\AppFramework\Http\JSONResponse; +use \OCA\AppFramework\Http\Http; use \OCA\News\BusinessLayer\FolderBusinessLayer; use \OCA\News\BusinessLayer\ItemBusinessLayer; @@ -65,7 +67,7 @@ class FolderAPI extends Controller { array_push($result['folders'], $folder->toAPI()); } - return new NewsAPIResult($result); + return new JSONResponse($result); } @@ -86,10 +88,10 @@ class FolderAPI extends Controller { $folder = $this->folderBusinessLayer->create($folderName, $userId); array_push($result['folders'], $folder->toAPI()); - return new NewsAPIResult($result); + return new JSONResponse($result); } catch(BusinessLayerExistsException $ex) { - return new NewsAPIResult(null, NewsAPIResult::EXISTS_ERROR, - $ex->getMessage()); + return new JSONResponse(array('message' => $ex->getMessage()), + Http::STATUS_CONFLICT); } } @@ -105,10 +107,10 @@ class FolderAPI extends Controller { try { $this->folderBusinessLayer->delete($folderId, $userId); - return new NewsAPIResult(); + return new JSONResponse(); } catch(BusinessLayerException $ex) { - return new NewsAPIResult(null, NewsAPIResult::NOT_FOUND_ERROR, - $ex->getMessage()); + return new JSONResponse(array('message' => $ex->getMessage()), + Http::STATUS_NOT_FOUND); } } @@ -125,15 +127,15 @@ class FolderAPI extends Controller { try { $this->folderBusinessLayer->rename($folderId, $folderName, $userId); - return new NewsAPIResult(); + return new JSONResponse(); } catch(BusinessLayerExistsException $ex) { - return new NewsAPIResult(null, NewsAPIResult::EXISTS_ERROR, - $ex->getMessage()); + return new JSONResponse(array('message' => $ex->getMessage()), + Http::STATUS_CONFLICT); } catch(BusinessLayerException $ex) { - return new NewsAPIResult(null, NewsAPIResult::NOT_FOUND_ERROR, - $ex->getMessage()); + return new JSONResponse(array('message' => $ex->getMessage()), + Http::STATUS_NOT_FOUND); } } @@ -149,7 +151,7 @@ class FolderAPI extends Controller { $newestItemId = (int) $this->params('newestItemId'); $this->itemBusinessLayer->readFolder($folderId, $newestItemId, $userId); - return new NewsAPIResult(); + return new JSONResponse(); } diff --git a/external/itemapi.php b/external/itemapi.php index fae0b3593..611a51fd2 100644 --- a/external/itemapi.php +++ b/external/itemapi.php @@ -28,6 +28,8 @@ namespace OCA\News\External; use \OCA\AppFramework\Core\API; use \OCA\AppFramework\Controller\Controller; use \OCA\AppFramework\Http\Request; +use \OCA\AppFramework\Http\JSONResponse; +use \OCA\AppFramework\Http\Http; use \OCA\News\BusinessLayer\ItemBusinessLayer; use \OCA\News\BusinessLayer\BusinessLayerException; @@ -81,7 +83,7 @@ class ItemAPI extends Controller { array_push($result['items'], $item->toAPI()); } - return new NewsAPIResult($result); + return new JSONResponse($result); } @@ -112,7 +114,7 @@ class ItemAPI extends Controller { array_push($result['items'], $item->toAPI()); } - return new NewsAPIResult($result); + return new JSONResponse($result); } @@ -121,10 +123,10 @@ class ItemAPI extends Controller { $itemId = (int) $this->params('itemId'); try { $this->itemBusinessLayer->read($itemId, $isRead, $userId); - return new NewsAPIResult(); + return new JSONResponse(); } catch(BusinessLayerException $ex){ - return new NewsAPIResult(null, NewsAPIResult::NOT_FOUND_ERROR, - $ex->getMessage()); + return new JSONResponse(array('message' => $ex->getMessage()), + Http::STATUS_NOT_FOUND); } } @@ -135,10 +137,10 @@ class ItemAPI extends Controller { $guidHash = $this->params('guidHash'); try { $this->itemBusinessLayer->star($feedId, $guidHash, $isStarred, $userId); - return new NewsAPIResult(); + return new JSONResponse(); } catch(BusinessLayerException $ex){ - return new NewsAPIResult(null, NewsAPIResult::NOT_FOUND_ERROR, - $ex->getMessage()); + return new JSONResponse(array('message' => $ex->getMessage()), + Http::STATUS_NOT_FOUND); } } @@ -193,7 +195,7 @@ class ItemAPI extends Controller { $newestItemId = (int) $this->params('newestItemId'); $this->itemBusinessLayer->readAll($newestItemId, $userId); - return new NewsAPIResult(); + return new JSONResponse(); } @@ -209,7 +211,7 @@ class ItemAPI extends Controller { } } - return new NewsAPIResult(); + return new JSONResponse(); } @@ -246,7 +248,7 @@ class ItemAPI extends Controller { } } - return new NewsAPIResult(); + return new JSONResponse(); } diff --git a/external/newsapiresult.php b/external/newsapiresult.php deleted file mode 100644 index e4034bc20..000000000 --- a/external/newsapiresult.php +++ /dev/null @@ -1,40 +0,0 @@ -<?php - -/** -* ownCloud - News -* -* @author Alessandro Cosentino -* @author Bernhard Posselt -* @copyright 2012 Alessandro Cosentino cosenal@gmail.com -* @copyright 2012 Bernhard Posselt nukeawhale@gmail.com -* -* This library is free software; you can redistribute it and/or -* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE -* License as published by the Free Software Foundation; either -* version 3 of the License, or any later version. -* -* This library is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU AFFERO GENERAL PUBLIC LICENSE for more details. -* -* You should have received a copy of the GNU Affero General Public -* License along with this library. If not, see <http://www.gnu.org/licenses/>. -* -*/ - -namespace OCA\News\External; - -use \OCA\AppFramework\External\APIResult; - -class NewsAPIResult extends APIResult { - - const EXISTS_ERROR = 409; - - public function __construct($data=null, $statusCode=NewsAPIResult::OK, - $message=null) { - parent::__construct($data, $statusCode, $message); - } - - -}
\ No newline at end of file |