jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/355450 )
Change subject: Renamed EntityDataRetrievalServiceFactory to DataAccessServices
......................................................................
Renamed EntityDataRetrievalServiceFactory to DataAccessServices
Also make RepositoryServiceContainer implement this interface.
With this DispatchingServiceFactory and RepositoryServiceContainer
could be interchangeable depending whether local configuration
is single-repository or using multiple (also foreign) repositories.
The new name hopefully better fits the general naming scheme
in the data access component.
Bug: T165041
Change-Id: I986b1526e84aefbba033287981d7b2a6c511984a
---
R data-access/src/DataAccessServices.php
M data-access/src/DispatchingServiceFactory.php
M data-access/src/RepositoryServiceContainer.php
M data-access/src/RepositoryServiceWiring.php
M data-access/tests/phpunit/RepositoryServiceWiringTest.php
5 files changed, 37 insertions(+), 3 deletions(-)
Approvals:
jenkins-bot: Verified
Thiemo Mättig (WMDE): Looks good to me, approved
diff --git a/data-access/src/EntityDataRetrievalServiceFactory.php
b/data-access/src/DataAccessServices.php
similarity index 95%
rename from data-access/src/EntityDataRetrievalServiceFactory.php
rename to data-access/src/DataAccessServices.php
index 0506272..e194dca 100644
--- a/data-access/src/EntityDataRetrievalServiceFactory.php
+++ b/data-access/src/DataAccessServices.php
@@ -14,7 +14,7 @@
*
* @license GPL-2.0+
*/
-interface EntityDataRetrievalServiceFactory {
+interface DataAccessServices {
/**
* @return EntityInfoBuilderFactory
diff --git a/data-access/src/DispatchingServiceFactory.php
b/data-access/src/DispatchingServiceFactory.php
index c3ef487..fd1cd9d 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
DataAccessServices, EntityStoreWatcher {
/**
* @var RepositoryServiceContainerFactory
diff --git a/data-access/src/RepositoryServiceContainer.php
b/data-access/src/RepositoryServiceContainer.php
index 1db0ac2..de4681f 100644
--- a/data-access/src/RepositoryServiceContainer.php
+++ b/data-access/src/RepositoryServiceContainer.php
@@ -21,7 +21,7 @@
*
* @license GPL-2.0+
*/
-class RepositoryServiceContainer extends ServiceContainer implements
EntityStoreWatcher {
+class RepositoryServiceContainer extends ServiceContainer implements
DataAccessServices, EntityStoreWatcher {
/**
* @var string|false
@@ -168,4 +168,28 @@
}
}
+ public function getEntityInfoBuilderFactory() {
+ return $this->getService( 'EntityInfoBuilderFactory' );
+ }
+
+ public function getEntityPrefetcher() {
+ return $this->getService( 'EntityPrefetcher' );
+ }
+
+ public function getEntityRevisionLookup() {
+ return $this->getService( 'EntityRevisionLookup' );
+ }
+
+ public function getPropertyInfoLookup() {
+ return $this->getService( 'PropertyInfoLookup' );
+ }
+
+ public function getTermBuffer() {
+ return $this->getService( 'TermBuffer' );
+ }
+
+ public function getTermSearchInteractorFactory() {
+ return $this->getService( 'TermSearchInteractorFactory' );
+ }
+
}
diff --git a/data-access/src/RepositoryServiceWiring.php
b/data-access/src/RepositoryServiceWiring.php
index cdaa66c..bb525d8 100644
--- a/data-access/src/RepositoryServiceWiring.php
+++ b/data-access/src/RepositoryServiceWiring.php
@@ -97,6 +97,13 @@
);
},
+ 'TermBuffer' => function(
+ RepositoryServiceContainer $services,
+ WikibaseClient $client
+ ) {
+ return $services->getService( 'PrefetchingTermLookup' );
+ },
+
'TermIndex' => function(
RepositoryServiceContainer $services,
WikibaseClient $client
diff --git a/data-access/tests/phpunit/RepositoryServiceWiringTest.php
b/data-access/tests/phpunit/RepositoryServiceWiringTest.php
index e0b60bb..41089d0 100644
--- a/data-access/tests/phpunit/RepositoryServiceWiringTest.php
+++ b/data-access/tests/phpunit/RepositoryServiceWiringTest.php
@@ -9,6 +9,7 @@
use Wikibase\DataModel\Entity\EntityIdParser;
use Wikibase\DataModel\Services\Entity\EntityPrefetcher;
use Wikibase\DataModel\Services\EntityId\PrefixMappingEntityIdParser;
+use Wikibase\DataModel\Services\Term\TermBuffer;
use Wikibase\Lib\Interactors\TermSearchInteractorFactory;
use Wikibase\Lib\Store\EntityInfoBuilderFactory;
use Wikibase\Lib\Store\EntityRevisionLookup;
@@ -48,6 +49,7 @@
[ 'EntityRevisionLookup', EntityRevisionLookup::class ],
[ 'PrefetchingTermLookup', PrefetchingTermLookup::class
],
[ 'PropertyInfoLookup', PropertyInfoLookup::class ],
+ [ 'TermBuffer', TermBuffer::class ],
[ 'TermIndex', TermIndex::class ],
[ 'TermSearchInteractorFactory',
TermSearchInteractorFactory::class ],
[ 'WikiPageEntityMetaDataAccessor',
WikiPageEntityMetaDataAccessor::class ],
@@ -75,6 +77,7 @@
'EntityRevisionLookup',
'PrefetchingTermLookup',
'PropertyInfoLookup',
+ 'TermBuffer',
'TermIndex',
'TermSearchInteractorFactory',
'WikiPageEntityMetaDataAccessor'
--
To view, visit https://gerrit.wikimedia.org/r/355450
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I986b1526e84aefbba033287981d7b2a6c511984a
Gerrit-PatchSet: 9
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: WMDE-leszek <[email protected]>
Gerrit-Reviewer: Thiemo Mättig (WMDE) <[email protected]>
Gerrit-Reviewer: WMDE-leszek <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
