WMDE-leszek has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/373288 )
Change subject: Remove no longer used WikibaseClient::getEntityContentDataCodec
......................................................................
Remove no longer used WikibaseClient::getEntityContentDataCodec
Related functionality moved to WikibaseServices.
Change-Id: Ie93e4603133f3ccdd2f255b9e019126611fb6e36
---
M client/includes/Store/Sql/DirectSqlStore.php
M client/includes/WikibaseClient.php
M client/tests/phpunit/includes/Store/Sql/DirectSqlStoreTest.php
M client/tests/phpunit/includes/WikibaseClientTest.php
4 files changed, 0 insertions(+), 36 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/88/373288/1
diff --git a/client/includes/Store/Sql/DirectSqlStore.php
b/client/includes/Store/Sql/DirectSqlStore.php
index 91ba3d0..5118911 100644
--- a/client/includes/Store/Sql/DirectSqlStore.php
+++ b/client/includes/Store/Sql/DirectSqlStore.php
@@ -30,7 +30,6 @@
use Wikibase\Lib\Store\CachingEntityRevisionLookup;
use Wikibase\Lib\Store\CachingSiteLinkLookup;
use Wikibase\Lib\Store\Sql\EntityChangeLookup;
-use Wikibase\Lib\Store\EntityContentDataCodec;
use Wikibase\Lib\Store\EntityNamespaceLookup;
use Wikibase\Lib\Store\EntityRevisionLookup;
use Wikibase\Lib\Store\RevisionBasedEntityLookup;
@@ -48,11 +47,6 @@
* @author Daniel Kinzler
*/
class DirectSqlStore implements ClientStore {
-
- /**
- * @var EntityContentDataCodec
- */
- private $contentCodec;
/**
* @var EntityChangeFactory
@@ -181,7 +175,6 @@
/**
* @param EntityChangeFactory $entityChangeFactory
- * @param EntityContentDataCodec $contentCodec
* @param EntityIdParser $entityIdParser
* @param EntityIdComposer $entityIdComposer
* @param EntityNamespaceLookup $entityNamespaceLookup
@@ -192,7 +185,6 @@
*/
public function __construct(
EntityChangeFactory $entityChangeFactory,
- EntityContentDataCodec $contentCodec,
EntityIdParser $entityIdParser,
EntityIdComposer $entityIdComposer,
EntityNamespaceLookup $entityNamespaceLookup,
@@ -200,7 +192,6 @@
$repoWiki = false,
$languageCode
) {
- $this->contentCodec = $contentCodec;
$this->entityChangeFactory = $entityChangeFactory;
$this->entityIdParser = $entityIdParser;
$this->entityIdComposer = $entityIdComposer;
diff --git a/client/includes/WikibaseClient.php
b/client/includes/WikibaseClient.php
index e980c2a..c427a30 100644
--- a/client/includes/WikibaseClient.php
+++ b/client/includes/WikibaseClient.php
@@ -43,7 +43,6 @@
use Wikibase\Client\Hooks\SidebarLinkBadgeDisplay;
use Wikibase\Client\ParserOutput\ClientParserOutputDataUpdater;
use Wikibase\Client\RecentChanges\RecentChangeFactory;
-use Wikibase\Client\Serializer\ForbiddenSerializer;
use Wikibase\Client\Store\TitleFactory;
use Wikibase\Client\Store\ClientStore;
use Wikibase\DataAccess\DataAccessSettings;
@@ -82,7 +81,6 @@
use Wikibase\Lib\PropertyInfoDataTypeLookup;
use Wikibase\Lib\RepositoryDefinitions;
use Wikibase\Lib\Store\CachingPropertyOrderProvider;
-use Wikibase\Lib\Store\EntityContentDataCodec;
use Wikibase\Lib\Store\EntityNamespaceLookup;
use Wikibase\Lib\Store\FallbackPropertyOrderProvider;
use Wikibase\Lib\Store\HttpUrlPropertyOrderProvider;
@@ -530,7 +528,6 @@
$repoDatabase = $this->settings->getSetting(
'repoDatabase' );
$this->store = new DirectSqlStore(
$this->getEntityChangeFactory(),
- $this->getEntityContentDataCodec(),
$this->getEntityIdParser(),
$this->getEntityIdComposer(),
$this->getEntityNamespaceLookup(),
@@ -916,21 +913,6 @@
public function getLanguageLinkBadgeDisplay() {
return new LanguageLinkBadgeDisplay(
$this->getSidebarLinkBadgeDisplay()
- );
- }
-
- /**
- * @return EntityContentDataCodec
- */
- public function getEntityContentDataCodec() {
- // Serialization is not supported on the client, since the
client never stores entities.
- $forbiddenSerializer = new ForbiddenSerializer( 'Entity
serialization is not supported on the client!' );
-
- return new EntityContentDataCodec(
- $this->getEntityIdParser(),
- $forbiddenSerializer,
- $this->getInternalFormatEntityDeserializer(),
- $this->getSettings()->getSetting(
'maxSerializedEntitySize' ) * 1024
);
}
diff --git a/client/tests/phpunit/includes/Store/Sql/DirectSqlStoreTest.php
b/client/tests/phpunit/includes/Store/Sql/DirectSqlStoreTest.php
index 5eaf244..bf1bad7 100644
--- a/client/tests/phpunit/includes/Store/Sql/DirectSqlStoreTest.php
+++ b/client/tests/phpunit/includes/Store/Sql/DirectSqlStoreTest.php
@@ -56,7 +56,6 @@
return new DirectSqlStore(
$entityChangeFactory,
- $client->getEntityContentDataCodec(),
new ItemIdParser(),
new EntityIdComposer( [] ),
new EntityNamespaceLookup( [] ),
diff --git a/client/tests/phpunit/includes/WikibaseClientTest.php
b/client/tests/phpunit/includes/WikibaseClientTest.php
index 5c7b37e..7964749 100644
--- a/client/tests/phpunit/includes/WikibaseClientTest.php
+++ b/client/tests/phpunit/includes/WikibaseClientTest.php
@@ -258,14 +258,6 @@
WikibaseClient::getDefaultInstance() );
}
- public function testGetEntityContentDataCodec() {
- $codec =
$this->getWikibaseClient()->getEntityContentDataCodec();
- $this->assertInstanceOf( EntityContentDataCodec::class, $codec
);
-
- $this->setExpectedException( RuntimeException::class );
- $codec->encodeEntity( new Item(), CONTENT_FORMAT_JSON );
- }
-
public function testGetExternalFormatDeserializerFactory() {
$deserializerFactory =
$this->getWikibaseClient()->getBaseDataModelDeserializerFactory();
$this->assertInstanceOf( DeserializerFactory::class,
$deserializerFactory );
--
To view, visit https://gerrit.wikimedia.org/r/373288
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie93e4603133f3ccdd2f255b9e019126611fb6e36
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: WMDE-leszek <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
