WMDE-leszek has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/353322 )
Change subject: Rename EntityDataRetrievalServiceFactory to
DispatchingDataAccessServices
......................................................................
Rename EntityDataRetrievalServiceFactory to DispatchingDataAccessServices
EntityDataRetrievalServiceFactory might be a misleading name given
the broader scope of WikibaseServices interface, also providing
data access/retrieval services.
The old interface is now only used to defined the contract
of the container/factory of services following the "dispatching"
pattern of accessing data of entities belonging to multiple
repositories.
As such MultipleRepositoryAwareWikibaseServices also uses
the renamed interface instead of its particular implementation
to be slightly more generic.
Bug: T165041
Change-Id: I1e4e93ed1933a5f025de7414be48a748da5a4341
---
R data-access/src/DispatchingDataAccessServices.php
M data-access/src/DispatchingServiceFactory.php
M data-access/src/MultipleRepositoryAwareWikibaseServices.php
M data-access/tests/phpunit/MultipleRepositoryAwareWikibaseServicesTest.php
4 files changed, 10 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/22/353322/1
diff --git a/data-access/src/EntityDataRetrievalServiceFactory.php
b/data-access/src/DispatchingDataAccessServices.php
similarity index 87%
rename from data-access/src/EntityDataRetrievalServiceFactory.php
rename to data-access/src/DispatchingDataAccessServices.php
index 0506272..82d85bc 100644
--- a/data-access/src/EntityDataRetrievalServiceFactory.php
+++ b/data-access/src/DispatchingDataAccessServices.php
@@ -10,11 +10,12 @@
use Wikibase\Lib\Store\PropertyInfoLookup;
/**
- * An interface of a factory of data retrieval/lookup services.
+ * An interface of a container/factory of services providing access to data of
entities from
+ * multiple repositories.
*
* @license GPL-2.0+
*/
-interface EntityDataRetrievalServiceFactory {
+interface DispatchingDataAccessServices {
/**
* @return EntityInfoBuilderFactory
diff --git a/data-access/src/DispatchingServiceFactory.php
b/data-access/src/DispatchingServiceFactory.php
index 793210d..c4f13f6 100644
--- a/data-access/src/DispatchingServiceFactory.php
+++ b/data-access/src/DispatchingServiceFactory.php
@@ -25,7 +25,7 @@
*
* @license GPL-2.0+
*/
-class DispatchingServiceFactory extends ServiceContainer implements
EntityDataRetrievalServiceFactory, EntityStoreWatcher {
+class DispatchingServiceFactory extends ServiceContainer implements
DispatchingDataAccessServices, EntityStoreWatcher {
/**
* @var RepositoryServiceContainerFactory
diff --git a/data-access/src/MultipleRepositoryAwareWikibaseServices.php
b/data-access/src/MultipleRepositoryAwareWikibaseServices.php
index d843a0f..21b711e 100644
--- a/data-access/src/MultipleRepositoryAwareWikibaseServices.php
+++ b/data-access/src/MultipleRepositoryAwareWikibaseServices.php
@@ -30,7 +30,7 @@
private $entityStoreWatcher;
public function __construct(
- DispatchingServiceFactory $dispatchingServiceContainer,
+ DispatchingDataAccessServices $dispatchingServiceContainer,
EntityStoreWatcher $entityStoreWatcher
) {
parent::__construct();
diff --git
a/data-access/tests/phpunit/MultipleRepositoryAwareWikibaseServicesTest.php
b/data-access/tests/phpunit/MultipleRepositoryAwareWikibaseServicesTest.php
index 5396f67..eb302d5 100644
--- a/data-access/tests/phpunit/MultipleRepositoryAwareWikibaseServicesTest.php
+++ b/data-access/tests/phpunit/MultipleRepositoryAwareWikibaseServicesTest.php
@@ -2,7 +2,7 @@
namespace Wikibase\DataAccess\Tests;
-use Wikibase\DataAccess\DispatchingServiceFactory;
+use Wikibase\DataAccess\DispatchingDataAccessServices;
use Wikibase\DataAccess\MultipleRepositoryAwareWikibaseServices;
use Wikibase\DataModel\Services\Entity\EntityPrefetcher;
use Wikibase\DataModel\Services\Term\TermBuffer;
@@ -22,10 +22,10 @@
class MultipleRepositoryAwareWikibaseServicesTest extends
\PHPUnit_Framework_TestCase {
/**
- * @return DispatchingServiceFactory
+ * @return DispatchingDataAccessServices
*/
private function getDispatchingServiceContainer() {
- $dispatchingServiceContainer = $this->getMockBuilder(
DispatchingServiceFactory::class )
+ $dispatchingServiceContainer = $this->getMockBuilder(
DispatchingDataAccessServices::class )
->disableOriginalConstructor()
->getMock();
@@ -57,7 +57,7 @@
return $dispatchingServiceContainer;
}
- private function getWikibaseServices( DispatchingServiceFactory
$dispatchingServiceContainer ) {
+ private function getWikibaseServices( DispatchingDataAccessServices
$dispatchingServiceContainer ) {
return new MultipleRepositoryAwareWikibaseServices(
$dispatchingServiceContainer,
$this->getMock( EntityStoreWatcher::class )
@@ -107,7 +107,7 @@
}
public function
testGetServicesIncludesServicesProvidedByDispatchingServiceContainer() {
- $dispatchingServiceContainer = $this->getMockBuilder(
DispatchingServiceFactory::class )
+ $dispatchingServiceContainer = $this->getMockBuilder(
DispatchingDataAccessServices::class )
->disableOriginalConstructor()
->getMock();
--
To view, visit https://gerrit.wikimedia.org/r/353322
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1e4e93ed1933a5f025de7414be48a748da5a4341
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
