jenkins-bot has submitted this change and it was merged.
Change subject: Kill ModifyClaim base class
......................................................................
Kill ModifyClaim base class
Bug: T71001
Change-Id: I1e5ee294d5787e17f1ba6936988c0f68fb8cf50c
---
M repo/includes/api/CreateClaim.php
D repo/includes/api/ModifyClaim.php
M repo/includes/api/RemoveClaims.php
M repo/includes/api/RemoveQualifiers.php
M repo/includes/api/RemoveReferences.php
M repo/includes/api/SetClaim.php
M repo/includes/api/SetClaimValue.php
M repo/includes/api/SetQualifier.php
M repo/includes/api/SetReference.php
9 files changed, 313 insertions(+), 86 deletions(-)
Approvals:
Thiemo Mättig (WMDE): Looks good to me, approved
Addshore: Looks good to me, approved
jenkins-bot: Verified
diff --git a/repo/includes/api/CreateClaim.php
b/repo/includes/api/CreateClaim.php
index 09044f4..e2e45c9 100644
--- a/repo/includes/api/CreateClaim.php
+++ b/repo/includes/api/CreateClaim.php
@@ -2,6 +2,7 @@
namespace Wikibase\Repo\Api;
+use ApiBase;
use ApiMain;
use Wikibase\ChangeOp\ChangeOpMainSnak;
use Wikibase\ChangeOp\StatementChangeOpFactory;
@@ -18,7 +19,7 @@
* @author Daniel Kinzler
* @author Tobias Gritschacher < tobias.gritschac...@wikimedia.de >
*/
-class CreateClaim extends ModifyClaim {
+class CreateClaim extends ApiBase {
/**
* @var StatementChangeOpFactory
@@ -29,6 +30,26 @@
* @var ApiErrorReporter
*/
private $errorReporter;
+
+ /**
+ * @var StatementModificationHelper
+ */
+ private $modificationHelper;
+
+ /**
+ * @var ResultBuilder
+ */
+ private $resultBuilder;
+
+ /**
+ * @var EntityLoadingHelper
+ */
+ private $entityLoadingHelper;
+
+ /**
+ * @var EntitySavingHelper
+ */
+ private $entitySavingHelper;
/**
* @param ApiMain $mainModule
@@ -44,6 +65,17 @@
$this->errorReporter = $apiHelperFactory->getErrorReporter(
$this );
$this->statementChangeOpFactory =
$changeOpFactoryProvider->getStatementChangeOpFactory();
+
+ $this->modificationHelper = new StatementModificationHelper(
+ $wikibaseRepo->getSnakConstructionService(),
+ $wikibaseRepo->getEntityIdParser(),
+ $wikibaseRepo->getStatementGuidValidator(),
+ $apiHelperFactory->getErrorReporter( $this )
+ );
+
+ $this->resultBuilder = $apiHelperFactory->getResultBuilder(
$this );
+ $this->entityLoadingHelper =
$apiHelperFactory->getEntityLoadingHelper( $this );
+ $this->entitySavingHelper =
$apiHelperFactory->getEntitySavingHelper( $this );
}
/**
diff --git a/repo/includes/api/ModifyClaim.php
b/repo/includes/api/ModifyClaim.php
deleted file mode 100644
index e5c057a..0000000
--- a/repo/includes/api/ModifyClaim.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-
-namespace Wikibase\Repo\Api;
-
-use ApiBase;
-use ApiMain;
-use Wikibase\DataModel\Entity\Entity;
-use Wikibase\DataModel\Entity\EntityId;
-use Wikibase\DataModel\Services\Statement\StatementGuidParser;
-use Wikibase\Repo\WikibaseRepo;
-
-/**
- * Base class for modifying claims.
- *
- * @since 0.4
- *
- * @licence GNU GPL v2+
- * @author Tobias Gritschacher < tobias.gritschac...@wikimedia.de >
- * @author Jeroen De Dauw < jeroended...@gmail.com >
- */
-abstract class ModifyClaim extends ApiBase {
-
- /**
- * @since 0.4
- *
- * @var StatementModificationHelper
- */
- protected $modificationHelper;
-
- /**
- * @since 0.5
- *
- * @var StatementGuidParser
- */
- protected $guidParser;
-
- /**
- * @var ResultBuilder
- */
- protected $resultBuilder;
-
- /**
- * @var EntityLoadingHelper
- */
- protected $entityLoadingHelper;
-
- /**
- * @var EntitySavingHelper
- */
- protected $entitySavingHelper;
-
- /**
- * @param ApiMain $mainModule
- * @param string $moduleName
- * @param string $modulePrefix
- *
- * @see ApiBase::__construct
- */
- public function __construct( ApiMain $mainModule, $moduleName,
$modulePrefix = '' ) {
- parent::__construct( $mainModule, $moduleName, $modulePrefix );
-
- $wikibaseRepo = WikibaseRepo::getDefaultInstance();
- $apiHelperFactory = $wikibaseRepo->getApiHelperFactory(
$this->getContext() );
-
- $this->modificationHelper = new StatementModificationHelper(
- $wikibaseRepo->getSnakConstructionService(),
- $wikibaseRepo->getEntityIdParser(),
- $wikibaseRepo->getStatementGuidValidator(),
- $apiHelperFactory->getErrorReporter( $this )
- );
-
- $this->guidParser = $wikibaseRepo->getStatementGuidParser();
- $this->resultBuilder = $apiHelperFactory->getResultBuilder(
$this );
- $this->entityLoadingHelper =
$apiHelperFactory->getEntityLoadingHelper( $this );
- $this->entitySavingHelper =
$apiHelperFactory->getEntitySavingHelper( $this );
- }
-
-}
diff --git a/repo/includes/api/RemoveClaims.php
b/repo/includes/api/RemoveClaims.php
index c50815b..b89a222 100644
--- a/repo/includes/api/RemoveClaims.php
+++ b/repo/includes/api/RemoveClaims.php
@@ -2,12 +2,14 @@
namespace Wikibase\Repo\Api;
+use ApiBase;
use ApiMain;
use Wikibase\ChangeOp\ChangeOp;
use Wikibase\ChangeOp\ChangeOpException;
use Wikibase\ChangeOp\ChangeOps;
use Wikibase\ChangeOp\StatementChangeOpFactory;
use Wikibase\DataModel\Entity\EntityId;
+use Wikibase\DataModel\Services\Statement\StatementGuidParser;
use Wikibase\DataModel\Statement\Statement;
use Wikibase\DataModel\Statement\StatementList;
use Wikibase\DataModel\Statement\StatementListProvider;
@@ -22,7 +24,7 @@
* @author Jeroen De Dauw < jeroended...@gmail.com >
* @author Tobias Gritschacher < tobias.gritschac...@wikimedia.de >
*/
-class RemoveClaims extends ModifyClaim {
+class RemoveClaims extends ApiBase {
/**
* @var StatementChangeOpFactory
@@ -33,6 +35,31 @@
* @var ApiErrorReporter
*/
private $errorReporter;
+
+ /**
+ * @var StatementModificationHelper
+ */
+ private $modificationHelper;
+
+ /**
+ * @var StatementGuidParser
+ */
+ private $guidParser;
+
+ /**
+ * @var ResultBuilder
+ */
+ private $resultBuilder;
+
+ /**
+ * @var EntityLoadingHelper
+ */
+ private $entityLoadingHelper;
+
+ /**
+ * @var EntitySavingHelper
+ */
+ private $entitySavingHelper;
/**
* @param ApiMain $mainModule
@@ -48,6 +75,18 @@
$this->errorReporter = $apiHelperFactory->getErrorReporter(
$this );
$this->statementChangeOpFactory =
$changeOpFactoryProvider->getStatementChangeOpFactory();
+
+ $this->modificationHelper = new StatementModificationHelper(
+ $wikibaseRepo->getSnakConstructionService(),
+ $wikibaseRepo->getEntityIdParser(),
+ $wikibaseRepo->getStatementGuidValidator(),
+ $apiHelperFactory->getErrorReporter( $this )
+ );
+
+ $this->guidParser = $wikibaseRepo->getStatementGuidParser();
+ $this->resultBuilder = $apiHelperFactory->getResultBuilder(
$this );
+ $this->entityLoadingHelper =
$apiHelperFactory->getEntityLoadingHelper( $this );
+ $this->entitySavingHelper =
$apiHelperFactory->getEntitySavingHelper( $this );
}
/**
diff --git a/repo/includes/api/RemoveQualifiers.php
b/repo/includes/api/RemoveQualifiers.php
index 1f67c66..5fce8b1 100644
--- a/repo/includes/api/RemoveQualifiers.php
+++ b/repo/includes/api/RemoveQualifiers.php
@@ -2,11 +2,13 @@
namespace Wikibase\Repo\Api;
+use ApiBase;
use ApiMain;
use Wikibase\ChangeOp\ChangeOp;
use Wikibase\ChangeOp\ChangeOpException;
use Wikibase\ChangeOp\ChangeOps;
use Wikibase\ChangeOp\StatementChangeOpFactory;
+use Wikibase\DataModel\Services\Statement\StatementGuidParser;
use Wikibase\DataModel\Statement\Statement;
use Wikibase\Repo\WikibaseRepo;
@@ -19,7 +21,7 @@
* @author Jeroen De Dauw < jeroended...@gmail.com >
* @author Tobias Gritschacher < tobias.gritschac...@wikimedia.de >
*/
-class RemoveQualifiers extends ModifyClaim {
+class RemoveQualifiers extends ApiBase {
/**
* @var StatementChangeOpFactory
@@ -30,6 +32,31 @@
* @var ApiErrorReporter
*/
private $errorReporter;
+
+ /**
+ * @var StatementModificationHelper
+ */
+ private $modificationHelper;
+
+ /**
+ * @var StatementGuidParser
+ */
+ private $guidParser;
+
+ /**
+ * @var ResultBuilder
+ */
+ private $resultBuilder;
+
+ /**
+ * @var EntityLoadingHelper
+ */
+ private $entityLoadingHelper;
+
+ /**
+ * @var EntitySavingHelper
+ */
+ private $entitySavingHelper;
/**
* @param ApiMain $mainModule
@@ -45,6 +72,18 @@
$this->errorReporter = $apiHelperFactory->getErrorReporter(
$this );
$this->statementChangeOpFactory =
$changeOpFactoryProvider->getStatementChangeOpFactory();
+
+ $this->modificationHelper = new StatementModificationHelper(
+ $wikibaseRepo->getSnakConstructionService(),
+ $wikibaseRepo->getEntityIdParser(),
+ $wikibaseRepo->getStatementGuidValidator(),
+ $apiHelperFactory->getErrorReporter( $this )
+ );
+
+ $this->guidParser = $wikibaseRepo->getStatementGuidParser();
+ $this->resultBuilder = $apiHelperFactory->getResultBuilder(
$this );
+ $this->entityLoadingHelper =
$apiHelperFactory->getEntityLoadingHelper( $this );
+ $this->entitySavingHelper =
$apiHelperFactory->getEntitySavingHelper( $this );
}
/**
diff --git a/repo/includes/api/RemoveReferences.php
b/repo/includes/api/RemoveReferences.php
index 1a8658e..3c329d5 100644
--- a/repo/includes/api/RemoveReferences.php
+++ b/repo/includes/api/RemoveReferences.php
@@ -2,11 +2,13 @@
namespace Wikibase\Repo\Api;
+use ApiBase;
use ApiMain;
use Wikibase\ChangeOp\ChangeOp;
use Wikibase\ChangeOp\ChangeOpException;
use Wikibase\ChangeOp\ChangeOps;
use Wikibase\ChangeOp\StatementChangeOpFactory;
+use Wikibase\DataModel\Services\Statement\StatementGuidParser;
use Wikibase\DataModel\Statement\Statement;
use Wikibase\Repo\WikibaseRepo;
@@ -19,7 +21,7 @@
* @author Jeroen De Dauw < jeroended...@gmail.com >
* @author Tobias Gritschacher < tobias.gritschac...@wikimedia.de >
*/
-class RemoveReferences extends ModifyClaim {
+class RemoveReferences extends ApiBase {
/**
* @var StatementChangeOpFactory
@@ -30,6 +32,31 @@
* @var ApiErrorReporter
*/
private $errorReporter;
+
+ /**
+ * @var StatementModificationHelper
+ */
+ private $modificationHelper;
+
+ /**
+ * @var StatementGuidParser
+ */
+ private $guidParser;
+
+ /**
+ * @var ResultBuilder
+ */
+ private $resultBuilder;
+
+ /**
+ * @var EntityLoadingHelper
+ */
+ private $entityLoadingHelper;
+
+ /**
+ * @var EntitySavingHelper
+ */
+ private $entitySavingHelper;
/**
* @param ApiMain $mainModule
@@ -45,6 +72,18 @@
$this->errorReporter = $apiHelperFactory->getErrorReporter(
$this );
$this->statementChangeOpFactory =
$changeOpFactoryProvider->getStatementChangeOpFactory();
+
+ $this->modificationHelper = new StatementModificationHelper(
+ $wikibaseRepo->getSnakConstructionService(),
+ $wikibaseRepo->getEntityIdParser(),
+ $wikibaseRepo->getStatementGuidValidator(),
+ $apiHelperFactory->getErrorReporter( $this )
+ );
+
+ $this->guidParser = $wikibaseRepo->getStatementGuidParser();
+ $this->resultBuilder = $apiHelperFactory->getResultBuilder(
$this );
+ $this->entityLoadingHelper =
$apiHelperFactory->getEntityLoadingHelper( $this );
+ $this->entitySavingHelper =
$apiHelperFactory->getEntitySavingHelper( $this );
}
/**
diff --git a/repo/includes/api/SetClaim.php b/repo/includes/api/SetClaim.php
index d665d8b..2d64f73 100644
--- a/repo/includes/api/SetClaim.php
+++ b/repo/includes/api/SetClaim.php
@@ -2,6 +2,7 @@
namespace Wikibase\Repo\Api;
+use ApiBase;
use ApiMain;
use DataValues\IllegalValueException;
use Deserializers\Deserializer;
@@ -14,6 +15,7 @@
use Wikibase\ChangeOp\StatementChangeOpFactory;
use Wikibase\ClaimSummaryBuilder;
use Wikibase\DataModel\Entity\Entity;
+use Wikibase\DataModel\Services\Statement\StatementGuidParser;
use Wikibase\DataModel\Services\Statement\StatementGuidParsingException;
use Wikibase\DataModel\Statement\Statement;
use Wikibase\DataModel\Statement\StatementListProvider;
@@ -30,7 +32,7 @@
* @author Tobias Gritschacher < tobias.gritschac...@wikimedia.de >
* @author Addshore
*/
-class SetClaim extends ModifyClaim {
+class SetClaim extends ApiBase {
/**
* @var StatementChangeOpFactory
@@ -48,6 +50,31 @@
private $statementDeserializer;
/**
+ * @var StatementModificationHelper
+ */
+ private $modificationHelper;
+
+ /**
+ * @var StatementGuidParser
+ */
+ private $guidParser;
+
+ /**
+ * @var ResultBuilder
+ */
+ private $resultBuilder;
+
+ /**
+ * @var EntityLoadingHelper
+ */
+ private $entityLoadingHelper;
+
+ /**
+ * @var EntitySavingHelper
+ */
+ private $entitySavingHelper;
+
+ /**
* @param ApiMain $mainModule
* @param string $moduleName
* @param string $modulePrefix
@@ -62,6 +89,18 @@
$this->statementDeserializer =
$wikibaseRepo->getStatementDeserializer();
$this->errorReporter = $apiHelperFactory->getErrorReporter(
$this );
$this->statementChangeOpFactory =
$changeOpFactoryProvider->getStatementChangeOpFactory();
+
+ $this->modificationHelper = new StatementModificationHelper(
+ $wikibaseRepo->getSnakConstructionService(),
+ $wikibaseRepo->getEntityIdParser(),
+ $wikibaseRepo->getStatementGuidValidator(),
+ $apiHelperFactory->getErrorReporter( $this )
+ );
+
+ $this->guidParser = $wikibaseRepo->getStatementGuidParser();
+ $this->resultBuilder = $apiHelperFactory->getResultBuilder(
$this );
+ $this->entityLoadingHelper =
$apiHelperFactory->getEntityLoadingHelper( $this );
+ $this->entitySavingHelper =
$apiHelperFactory->getEntitySavingHelper( $this );
}
/**
diff --git a/repo/includes/api/SetClaimValue.php
b/repo/includes/api/SetClaimValue.php
index f50e9e0..0458376 100644
--- a/repo/includes/api/SetClaimValue.php
+++ b/repo/includes/api/SetClaimValue.php
@@ -2,8 +2,10 @@
namespace Wikibase\Repo\Api;
+use ApiBase;
use ApiMain;
use Wikibase\ChangeOp\StatementChangeOpFactory;
+use Wikibase\DataModel\Services\Statement\StatementGuidParser;
use Wikibase\Repo\WikibaseRepo;
/**
@@ -15,7 +17,7 @@
* @author Jeroen De Dauw < jeroended...@gmail.com >
* @author Tobias Gritschacher < tobias.gritschac...@wikimedia.de >
*/
-class SetClaimValue extends ModifyClaim {
+class SetClaimValue extends ApiBase {
/**
* @var StatementChangeOpFactory
@@ -26,6 +28,31 @@
* @var ApiErrorReporter
*/
private $errorReporter;
+
+ /**
+ * @var StatementModificationHelper
+ */
+ private $modificationHelper;
+
+ /**
+ * @var StatementGuidParser
+ */
+ private $guidParser;
+
+ /**
+ * @var ResultBuilder
+ */
+ private $resultBuilder;
+
+ /**
+ * @var EntityLoadingHelper
+ */
+ private $entityLoadingHelper;
+
+ /**
+ * @var EntitySavingHelper
+ */
+ private $entitySavingHelper;
/**
* @param ApiMain $mainModule
@@ -41,6 +68,18 @@
$this->errorReporter = $apiHelperFactory->getErrorReporter(
$this );
$this->statementChangeOpFactory =
$changeOpFactoryProvider->getStatementChangeOpFactory();
+
+ $this->modificationHelper = new StatementModificationHelper(
+ $wikibaseRepo->getSnakConstructionService(),
+ $wikibaseRepo->getEntityIdParser(),
+ $wikibaseRepo->getStatementGuidValidator(),
+ $apiHelperFactory->getErrorReporter( $this )
+ );
+
+ $this->guidParser = $wikibaseRepo->getStatementGuidParser();
+ $this->resultBuilder = $apiHelperFactory->getResultBuilder(
$this );
+ $this->entityLoadingHelper =
$apiHelperFactory->getEntityLoadingHelper( $this );
+ $this->entitySavingHelper =
$apiHelperFactory->getEntitySavingHelper( $this );
}
/**
diff --git a/repo/includes/api/SetQualifier.php
b/repo/includes/api/SetQualifier.php
index 74a8637..1c2d094 100644
--- a/repo/includes/api/SetQualifier.php
+++ b/repo/includes/api/SetQualifier.php
@@ -2,10 +2,12 @@
namespace Wikibase\Repo\Api;
+use ApiBase;
use ApiMain;
use Wikibase\ChangeOp\ChangeOpQualifier;
use Wikibase\ChangeOp\StatementChangeOpFactory;
use Wikibase\DataModel\Entity\PropertyId;
+use Wikibase\DataModel\Services\Statement\StatementGuidParser;
use Wikibase\DataModel\Statement\Statement;
use Wikibase\Repo\WikibaseRepo;
@@ -19,7 +21,7 @@
* @author Daniel Kinzler
* @author Tobias Gritschacher < tobias.gritschac...@wikimedia.de >
*/
-class SetQualifier extends ModifyClaim {
+class SetQualifier extends ApiBase {
/**
* @var StatementChangeOpFactory
@@ -30,6 +32,31 @@
* @var ApiErrorReporter
*/
private $errorReporter;
+
+ /**
+ * @var StatementModificationHelper
+ */
+ private $modificationHelper;
+
+ /**
+ * @var StatementGuidParser
+ */
+ private $guidParser;
+
+ /**
+ * @var ResultBuilder
+ */
+ private $resultBuilder;
+
+ /**
+ * @var EntityLoadingHelper
+ */
+ private $entityLoadingHelper;
+
+ /**
+ * @var EntitySavingHelper
+ */
+ private $entitySavingHelper;
/**
* @param ApiMain $mainModule
@@ -45,6 +72,18 @@
$this->errorReporter = $apiHelperFactory->getErrorReporter(
$this );
$this->statementChangeOpFactory =
$changeOpFactoryProvider->getStatementChangeOpFactory();
+
+ $this->modificationHelper = new StatementModificationHelper(
+ $wikibaseRepo->getSnakConstructionService(),
+ $wikibaseRepo->getEntityIdParser(),
+ $wikibaseRepo->getStatementGuidValidator(),
+ $apiHelperFactory->getErrorReporter( $this )
+ );
+
+ $this->guidParser = $wikibaseRepo->getStatementGuidParser();
+ $this->resultBuilder = $apiHelperFactory->getResultBuilder(
$this );
+ $this->entityLoadingHelper =
$apiHelperFactory->getEntityLoadingHelper( $this );
+ $this->entitySavingHelper =
$apiHelperFactory->getEntitySavingHelper( $this );
}
/**
diff --git a/repo/includes/api/SetReference.php
b/repo/includes/api/SetReference.php
index 8c03196..8bc4564 100644
--- a/repo/includes/api/SetReference.php
+++ b/repo/includes/api/SetReference.php
@@ -2,12 +2,14 @@
namespace Wikibase\Repo\Api;
+use ApiBase;
use ApiMain;
use Deserializers\Exceptions\DeserializationException;
use Wikibase\ChangeOp\ChangeOpReference;
use Wikibase\ChangeOp\StatementChangeOpFactory;
use Wikibase\DataModel\DeserializerFactory;
use Wikibase\DataModel\Reference;
+use Wikibase\DataModel\Services\Statement\StatementGuidParser;
use Wikibase\DataModel\Snak\SnakList;
use Wikibase\DataModel\Statement\Statement;
use Wikibase\Repo\WikibaseRepo;
@@ -21,7 +23,7 @@
* @author Jeroen De Dauw < jeroended...@gmail.com >
* @author Tobias Gritschacher < tobias.gritschac...@wikimedia.de >
*/
-class SetReference extends ModifyClaim {
+class SetReference extends ApiBase {
/**
* @var StatementChangeOpFactory
@@ -37,6 +39,31 @@
* @var DeserializerFactory
*/
private $deserializerFactory;
+
+ /**
+ * @var StatementModificationHelper
+ */
+ private $modificationHelper;
+
+ /**
+ * @var StatementGuidParser
+ */
+ private $guidParser;
+
+ /**
+ * @var ResultBuilder
+ */
+ private $resultBuilder;
+
+ /**
+ * @var EntityLoadingHelper
+ */
+ private $entityLoadingHelper;
+
+ /**
+ * @var EntitySavingHelper
+ */
+ private $entitySavingHelper;
/**
* @param ApiMain $mainModule
@@ -56,6 +83,18 @@
$wikibaseRepo->getDataValueDeserializer(),
$wikibaseRepo->getEntityIdParser()
);
+
+ $this->modificationHelper = new StatementModificationHelper(
+ $wikibaseRepo->getSnakConstructionService(),
+ $wikibaseRepo->getEntityIdParser(),
+ $wikibaseRepo->getStatementGuidValidator(),
+ $apiHelperFactory->getErrorReporter( $this )
+ );
+
+ $this->guidParser = $wikibaseRepo->getStatementGuidParser();
+ $this->resultBuilder = $apiHelperFactory->getResultBuilder(
$this );
+ $this->entityLoadingHelper =
$apiHelperFactory->getEntityLoadingHelper( $this );
+ $this->entitySavingHelper =
$apiHelperFactory->getEntitySavingHelper( $this );
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/266798
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1e5ee294d5787e17f1ba6936988c0f68fb8cf50c
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Addshore <addshorew...@gmail.com>
Gerrit-Reviewer: Addshore <addshorew...@gmail.com>
Gerrit-Reviewer: Thiemo Mättig (WMDE) <thiemo.maet...@wikimedia.de>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
