ported to owncloud internal appframework classes, confused with how to start the app and define deps

4 files changed, 37 insertions, 31 deletions

diff --git a/api/feedapi.php b/api/feedapi.php
index 0880434d8..e77efef2e 100644
--- a/api/feedapi.php
+++ b/api/feedapi.php
@@ -25,12 +25,12 @@
 
 namespace OCA\News\API;
 
-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 \OCP\IRequest;
+use \OCP\AppFramework\Controller;
+use \OCP\AppFramework\Http;
+use \OCP\AppFramework\Http\JSONResponse;
 
+use \OCA\News\Core\API;
 use \OCA\News\BusinessLayer\FeedBusinessLayer;
 use \OCA\News\BusinessLayer\FolderBusinessLayer;
 use \OCA\News\BusinessLayer\ItemBusinessLayer;
@@ -43,16 +43,18 @@ class FeedAPI extends Controller {
 	private $itemBusinessLayer;
 	private $feedBusinessLayer;
 	private $folderBusinessLayer;
+	private $api;
 
 	public function __construct(API $api,
-	                            Request $request,
+	                            IRequest $request,
 	                            FolderBusinessLayer $folderBusinessLayer,
 	                            FeedBusinessLayer $feedBusinessLayer,
 	                            ItemBusinessLayer $itemBusinessLayer){
-		parent::__construct($api, $request);
+		parent::__construct($api->getAppName(), $request);
 		$this->folderBusinessLayer = $folderBusinessLayer;
 		$this->feedBusinessLayer = $feedBusinessLayer;
 		$this->itemBusinessLayer = $itemBusinessLayer;
+		$this->api = $api;
 	}
 
 
diff --git a/api/folderapi.php b/api/folderapi.php
index 12e400a76..67efa59ea 100644
--- a/api/folderapi.php
+++ b/api/folderapi.php
@@ -25,12 +25,12 @@
 
 namespace OCA\News\API;
 
-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 \OCP\IRequest;
+use \OCP\AppFramework\Controller;
+use \OCP\AppFramework\Http;
+use \OCP\AppFramework\Http\JSONResponse;
 
+use \OCA\News\Core\API;
 use \OCA\News\BusinessLayer\FolderBusinessLayer;
 use \OCA\News\BusinessLayer\ItemBusinessLayer;
 use \OCA\News\BusinessLayer\BusinessLayerException;
@@ -42,14 +42,16 @@ class FolderAPI extends Controller {
 
 	private $folderBusinessLayer;
 	private $itemBusinessLayer;
+	private $api;
 
 	public function __construct(API $api,
-	                            Request $request,
+	                            IRequest $request,
 	                            FolderBusinessLayer $folderBusinessLayer,
 	                            ItemBusinessLayer $itemBusinessLayer){
-		parent::__construct($api, $request);
+		parent::__construct($api->getAppName(), $request);
 		$this->folderBusinessLayer = $folderBusinessLayer;
 		$this->itemBusinessLayer = $itemBusinessLayer;
+		$this->api = $api;
 	}
 
 
diff --git a/api/itemapi.php b/api/itemapi.php
index 335132d60..821fdd382 100644
--- a/api/itemapi.php
+++ b/api/itemapi.php
@@ -25,25 +25,26 @@
 
 namespace OCA\News\API;
 
-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 \OCP\IRequest;
+use \OCP\AppFramework\Controller;
+use \OCP\AppFramework\Http;
+use \OCP\AppFramework\Http\JSONResponse;
 
 use \OCA\News\BusinessLayer\ItemBusinessLayer;
 use \OCA\News\BusinessLayer\BusinessLayerException;
-
+use \OCA\News\Core\API;
 
 class ItemAPI extends Controller {
 
 	private $itemBusinessLayer;
+	private $api;
 
 	public function __construct(API $api,
-	                            Request $request,
+	                            IRequest $request,
 	                            ItemBusinessLayer $itemBusinessLayer){
-		parent::__construct($api, $request);
+		parent::__construct($api->getAppName(), $request);
 		$this->itemBusinessLayer = $itemBusinessLayer;
+		$this->api = $api;
 	}
 
 
diff --git a/api/newsapi.php b/api/newsapi.php
index aaed92926..322defead 100644
--- a/api/newsapi.php
+++ b/api/newsapi.php
@@ -25,23 +25,24 @@
 
 namespace OCA\News\API;
 
-use \OCA\AppFramework\Core\API;
-use \OCA\AppFramework\Controller\Controller;
-use \OCA\AppFramework\Http\Request;
-use \OCA\AppFramework\Http\JSONResponse;
-use \OCA\AppFramework\Http\Response;
-use \OCA\AppFramework\Http\Http;
+use \OCP\IRequest;
+use \OCP\AppFramework\Controller;
+use \OCP\AppFramework\Http;
+use \OCP\AppFramework\Http\JSONResponse;
+use \OCP\AppFramework\Http\Response;
 
 use \OCA\News\Utility\Updater;
-
+use \OCA\News\Core\API;
 
 class NewsAPI extends Controller {
 
 	private $updater;
+	private $api;
 
-	public function __construct(API $api, Request $request, Updater $updater){
-		parent::__construct($api, $request);
+	public function __construct(API $api, IRequest $request, Updater $updater){
+		parent::__construct($api->getAppName(), $request);
 		$this->updater = $updater;
+		$this->api = $api;
 	}