From 9c14663be972e9726049fcb76de90b34f5ca128a Mon Sep 17 00:00:00 2001
From: Aaron Schulz <aschulz@wikimedia.org>
Date: Thu, 14 Dec 2023 14:26:46 -0800
Subject: upload: switch AssembleUploadChunksJob to GenericParameterJob

Change-Id: I75e401c047828abf4b42d519509a1e717509ba2f
---
 includes/api/ApiUpload.php                         | 16 ++++++----------
 includes/jobqueue/jobs/AssembleUploadChunksJob.php |  7 +++----
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/includes/api/ApiUpload.php b/includes/api/ApiUpload.php
index 6a1a8de1e529..4b420bf46de8 100644
--- a/includes/api/ApiUpload.php
+++ b/includes/api/ApiUpload.php
@@ -25,7 +25,6 @@ use MediaWiki\Logger\LoggerFactory;
 use MediaWiki\MainConfigNames;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Status\Status;
-use MediaWiki\Title\Title;
 use MediaWiki\User\Options\UserOptionsLookup;
 use MediaWiki\User\User;
 use MediaWiki\Watchlist\WatchlistManager;
@@ -400,15 +399,12 @@ class ApiUpload extends ApiBase {
 				// into job queue until after the current transaction has completed since
 				// this depends on values in uploadstash table that were updated during
 				// the current transaction. (T350917)
-				$this->jobQueueGroup->lazyPush( new AssembleUploadChunksJob(
-					Title::makeTitle( NS_FILE, $filekey ),
-					[
-						'filename' => $this->mParams['filename'],
-						'filekey' => $filekey,
-						'filesize' => $this->mParams['filesize'],
-						'session' => $this->getContext()->exportSession()
-					]
-				) );
+				$this->jobQueueGroup->lazyPush( new AssembleUploadChunksJob( [
+					'filename' => $this->mParams['filename'],
+					'filekey' => $filekey,
+					'filesize' => $this->mParams['filesize'],
+					'session' => $this->getContext()->exportSession()
+				] ) );
 				$this->log->info( "Received final chunk of {filename} for {user}, queuing assemble job",
 					[
 						'user' => $this->getUser()->getName(),
diff --git a/includes/jobqueue/jobs/AssembleUploadChunksJob.php b/includes/jobqueue/jobs/AssembleUploadChunksJob.php
index 45887ba1fcca..404f20a587a7 100644
--- a/includes/jobqueue/jobs/AssembleUploadChunksJob.php
+++ b/includes/jobqueue/jobs/AssembleUploadChunksJob.php
@@ -22,7 +22,6 @@ use MediaWiki\Context\RequestContext;
 use MediaWiki\Logger\LoggerFactory;
 use MediaWiki\Request\WebRequestUpload;
 use MediaWiki\Status\Status;
-use MediaWiki\Title\Title;
 use Wikimedia\ScopedCallback;
 
 /**
@@ -31,9 +30,9 @@ use Wikimedia\ScopedCallback;
  * @ingroup Upload
  * @ingroup JobQueue
  */
-class AssembleUploadChunksJob extends Job {
-	public function __construct( Title $title, array $params ) {
-		parent::__construct( 'AssembleUploadChunks', $title, $params );
+class AssembleUploadChunksJob extends Job implements GenericParameterJob {
+	public function __construct( array $params ) {
+		parent::__construct( 'AssembleUploadChunks', $params );
 		$this->removeDuplicates = true;
 	}
 
-- 
cgit v1.2.3