Merge pull request #1952 from nextcloud/deprecated_backgroudjob

Cleanup deprecated backgroudjob functions

3 files changed, 0 insertions, 112 deletions

diff --git a/lib/private/App/CodeChecker/DeprecationCheck.php b/lib/private/App/CodeChecker/DeprecationCheck.php
index 60e7fdf078d..a700345238b 100644
--- a/lib/private/App/CodeChecker/DeprecationCheck.php
+++ b/lib/private/App/CodeChecker/DeprecationCheck.php
@@ -114,13 +114,6 @@ class DeprecationCheck extends AbstractCheck implements ICheck {
 			'OCP\AppFramework\IAppContainer::isAdminUser' => '8.0.0',
 			'OCP\AppFramework\IAppContainer::log' => '8.0.0',
 
-			'OCP\BackgroundJob::addQueuedTask' => '6.0.0',
-			'OCP\BackgroundJob::addRegularTask' => '6.0.0',
-			'OCP\BackgroundJob::allQueuedTasks' => '6.0.0',
-			'OCP\BackgroundJob::allRegularTasks' => '6.0.0',
-			'OCP\BackgroundJob::deleteQueuedTask' => '6.0.0',
-			'OCP\BackgroundJob::findQueuedTask' => '6.0.0',
-			'OCP\BackgroundJob::queuedTaskWhereAppIs' => '6.0.0',
 			'OCP\BackgroundJob::registerJob' => '8.1.0',
 
 			'OCP\Files::tmpFile' => '8.1.0',
diff --git a/lib/private/AppFramework/Core/API.php b/lib/private/AppFramework/Core/API.php
index 85cdc00a63a..683962d67dc 100644
--- a/lib/private/AppFramework/Core/API.php
+++ b/lib/private/AppFramework/Core/API.php
@@ -170,19 +170,6 @@ class API implements IApi{
 		}
 	}
 
-
-	/**
-	 * Register a backgroundjob task
-	 * @param string $className full namespace and class name of the class
-	 * @param string $methodName the name of the static method that should be
-	 * called
-	 * @deprecated Use \OC::$server->getJobList()->add();
-	 */
-	public function addRegularTask($className, $methodName) {
-		\OCP\Backgroundjob::addRegularTask($className, $methodName);
-	}
-
-
 	/**
 	 * Tells ownCloud to include a template in the admin overview
 	 * @param string $mainPath the path to the main php file without the php
diff --git a/lib/public/BackgroundJob.php b/lib/public/BackgroundJob.php
index b49dd922786..43f445362dc 100644
--- a/lib/public/BackgroundJob.php
+++ b/lib/public/BackgroundJob.php
@@ -90,96 +90,4 @@ class BackgroundJob {
 		$jobList = \OC::$server->getJobList();
 		$jobList->add($job, $argument);
 	}
-
-	/**
-	 * @deprecated 6.0.0
-	 * creates a regular task
-	 * @param string $klass class name
-	 * @param string $method method name
-	 * @return boolean|null
-	 * @since 4.5.0
-	 */
-	public static function addRegularTask($klass, $method) {
-		if (!\OCP\Util::needUpgrade()) {
-			self::registerJob('OC\BackgroundJob\Legacy\RegularJob', array($klass, $method));
-			return true;
-		}
-	}
-
-	/**
-	 * @deprecated 6.0.0
-	 * gets all regular tasks
-	 * @return array
-	 *
-	 * key is string "$klass-$method", value is array( $klass, $method )
-	 * @since 4.5.0
-	 */
-	static public function allRegularTasks() {
-		return [];
-	}
-
-	/**
-	 * @deprecated 6.0.0
-	 * Gets one queued task
-	 * @param int $id ID of the task
-	 * @return BackgroundJob\IJob|null
-	 * @since 4.5.0
-	 */
-	public static function findQueuedTask($id) {
-		$jobList = \OC::$server->getJobList();
-		return $jobList->getById($id);
-	}
-
-	/**
-	 * @deprecated 6.0.0
-	 * Gets all queued tasks
-	 * @return array an array of associative arrays
-	 * @since 4.5.0
-	 */
-	public static function allQueuedTasks() {
-		return [];
-	}
-
-	/**
-	 * @deprecated 6.0.0
-	 * Gets all queued tasks of a specific app
-	 * @param string $app app name
-	 * @return array an array of associative arrays
-	 * @since 4.5.0
-	 */
-	public static function queuedTaskWhereAppIs($app) {
-		return [];
-	}
-
-	/**
-	 * @deprecated 6.0.0
-	 * queues a task
-	 * @param string $app app name
-	 * @param string $class class name
-	 * @param string $method method name
-	 * @param string $parameters all useful data as text
-	 * @return boolean id of task
-	 * @since 4.5.0
-	 */
-	public static function addQueuedTask($app, $class, $method, $parameters) {
-		self::registerJob('OC\BackgroundJob\Legacy\QueuedJob', array('app' => $app, 'klass' => $class, 'method' => $method, 'parameters' => $parameters));
-		return true;
-	}
-
-	/**
-	 * @deprecated 6.0.0
-	 * deletes a queued task
-	 * @param int $id id of task
-	 * @return boolean|null
-	 *
-	 * Deletes a report
-	 * @since 4.5.0
-	 */
-	public static function deleteQueuedTask($id) {
-		$jobList = \OC::$server->getJobList();
-		$job = $jobList->getById($id);
-		if ($job) {
-			$jobList->remove($job);
-		}
-	}
 }