[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Clearer naming of EntityDataRetrievalServiceFactory variable...

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/339385 )

Change subject: Clearer naming of EntityDataRetrievalServiceFactory variable in 
SqlStore
..


Clearer naming of EntityDataRetrievalServiceFactory variable in SqlStore

Change-Id: Ibc70ff314294f8ca8cecefdb9b0021b2b3748609
---
M repo/includes/Store/Sql/SqlStore.php
1 file changed, 12 insertions(+), 12 deletions(-)

Approvals:
  jenkins-bot: Verified
  Thiemo Mättig (WMDE): Looks good to me, approved



diff --git a/repo/includes/Store/Sql/SqlStore.php 
b/repo/includes/Store/Sql/SqlStore.php
index 530079a..2be8c0b 100644
--- a/repo/includes/Store/Sql/SqlStore.php
+++ b/repo/includes/Store/Sql/SqlStore.php
@@ -157,7 +157,7 @@
/**
 * @var EntityDataRetrievalServiceFactory
 */
-   private $entityDataRetrievalServices;
+   private $entityDataRetrievalServiceFactory;
 
/**
 * @var string
@@ -187,8 +187,8 @@
 * @param EntityIdLookup $entityIdLookup
 * @param EntityTitleStoreLookup $entityTitleLookup
 * @param EntityNamespaceLookup $entityNamespaceLookup
-* @param EntityDataRetrievalServiceFactory|null 
$entityDataRetrievalServiceFactory Optional service factory
-*providing services configured for the configured repositories
+* @param EntityDataRetrievalServiceFactory|null 
$entityDataRetrievalServiceFactory Optional
+*service factory providing services configured for the 
configured repositories
 */
public function __construct(
EntityChangeFactory $entityChangeFactory,
@@ -207,7 +207,7 @@
$this->entityIdLookup = $entityIdLookup;
$this->entityTitleLookup = $entityTitleLookup;
$this->entityNamespaceLookup = $entityNamespaceLookup;
-   $this->entityDataRetrievalServices = 
$entityDataRetrievalServiceFactory;
+   $this->entityDataRetrievalServiceFactory = 
$entityDataRetrievalServiceFactory;
 
//TODO: inject settings
$settings = WikibaseRepo::getDefaultInstance()->getSettings();
@@ -444,11 +444,11 @@
/** @var WikiPageEntityStore $dispatcher */
$dispatcher = $this->getEntityStoreWatcher();
 
-   if ( $this->entityDataRetrievalServices !== null ) {
-   // Use $entityDataRetrievalServices as a watcher for 
entity changes,
+   if ( $this->entityDataRetrievalServiceFactory !== null ) {
+   // Use entityDataRetrievalServiceFactory as a watcher 
for entity changes,
// so that caches of services provided are updated when 
necessary.
-   $dispatcher->registerWatcher( 
$this->entityDataRetrievalServices );
-   $nonCachingLookup = 
$this->entityDataRetrievalServices->getEntityRevisionLookup();
+   $dispatcher->registerWatcher( 
$this->entityDataRetrievalServiceFactory );
+   $nonCachingLookup = 
$this->entityDataRetrievalServiceFactory->getEntityRevisionLookup();
} else {
// Watch for entity changes
$metaDataFetcher = $this->getEntityPrefetcher();
@@ -530,8 +530,8 @@
 * @return PropertyInfoLookup
 */
private function newPropertyInfoLookup() {
-   if ( $this->entityDataRetrievalServices !== null ) {
-   $table = 
$this->entityDataRetrievalServices->getPropertyInfoLookup();
+   if ( $this->entityDataRetrievalServiceFactory !== null ) {
+   $table = 
$this->entityDataRetrievalServiceFactory->getPropertyInfoLookup();
} else {
$table = $this->getPropertyInfoTable();
}
@@ -620,8 +620,8 @@
 * @return EntityPrefetcher
 */
private function newEntityPrefetcher() {
-   if ( $this->entityDataRetrievalServices !== null ) {
-   return 
$this->entityDataRetrievalServices->getEntityPrefetcher();
+   if ( $this->entityDataRetrievalServiceFactory !== null ) {
+   return 
$this->entityDataRetrievalServiceFactory->getEntityPrefetcher();
}
return new PrefetchingWikiPageEntityMetaDataAccessor(
new WikiPageEntityMetaDataLookup( 
$this->entityNamespaceLookup )

-- 
To view, visit https://gerrit.wikimedia.org/r/339385
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibc70ff314294f8ca8cecefdb9b0021b2b3748609
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Aude 
Gerrit-Reviewer: Thiemo Mättig (WMDE) 
Gerrit-Reviewer: jenkins-bot <>

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Clearer naming of EntityDataRetrievalServiceFactory variable...

[Aude (Code Review)]

Aude has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/339385 )

Change subject: Clearer naming of EntityDataRetrievalServiceFactory variable in 
SqlStore
..

Clearer naming of EntityDataRetrievalServiceFactory variable in SqlStore

Change-Id: Ibc70ff314294f8ca8cecefdb9b0021b2b3748609
---
M repo/includes/Store/Sql/SqlStore.php
1 file changed, 12 insertions(+), 12 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/85/339385/1

diff --git a/repo/includes/Store/Sql/SqlStore.php 
b/repo/includes/Store/Sql/SqlStore.php
index 530079a..2be8c0b 100644
--- a/repo/includes/Store/Sql/SqlStore.php
+++ b/repo/includes/Store/Sql/SqlStore.php
@@ -157,7 +157,7 @@
/**
 * @var EntityDataRetrievalServiceFactory
 */
-   private $entityDataRetrievalServices;
+   private $entityDataRetrievalServiceFactory;
 
/**
 * @var string
@@ -187,8 +187,8 @@
 * @param EntityIdLookup $entityIdLookup
 * @param EntityTitleStoreLookup $entityTitleLookup
 * @param EntityNamespaceLookup $entityNamespaceLookup
-* @param EntityDataRetrievalServiceFactory|null 
$entityDataRetrievalServiceFactory Optional service factory
-*providing services configured for the configured repositories
+* @param EntityDataRetrievalServiceFactory|null 
$entityDataRetrievalServiceFactory Optional
+*service factory providing services configured for the 
configured repositories
 */
public function __construct(
EntityChangeFactory $entityChangeFactory,
@@ -207,7 +207,7 @@
$this->entityIdLookup = $entityIdLookup;
$this->entityTitleLookup = $entityTitleLookup;
$this->entityNamespaceLookup = $entityNamespaceLookup;
-   $this->entityDataRetrievalServices = 
$entityDataRetrievalServiceFactory;
+   $this->entityDataRetrievalServiceFactory = 
$entityDataRetrievalServiceFactory;
 
//TODO: inject settings
$settings = WikibaseRepo::getDefaultInstance()->getSettings();
@@ -444,11 +444,11 @@
/** @var WikiPageEntityStore $dispatcher */
$dispatcher = $this->getEntityStoreWatcher();
 
-   if ( $this->entityDataRetrievalServices !== null ) {
-   // Use $entityDataRetrievalServices as a watcher for 
entity changes,
+   if ( $this->entityDataRetrievalServiceFactory !== null ) {
+   // Use entityDataRetrievalServiceFactory as a watcher 
for entity changes,
// so that caches of services provided are updated when 
necessary.
-   $dispatcher->registerWatcher( 
$this->entityDataRetrievalServices );
-   $nonCachingLookup = 
$this->entityDataRetrievalServices->getEntityRevisionLookup();
+   $dispatcher->registerWatcher( 
$this->entityDataRetrievalServiceFactory );
+   $nonCachingLookup = 
$this->entityDataRetrievalServiceFactory->getEntityRevisionLookup();
} else {
// Watch for entity changes
$metaDataFetcher = $this->getEntityPrefetcher();
@@ -530,8 +530,8 @@
 * @return PropertyInfoLookup
 */
private function newPropertyInfoLookup() {
-   if ( $this->entityDataRetrievalServices !== null ) {
-   $table = 
$this->entityDataRetrievalServices->getPropertyInfoLookup();
+   if ( $this->entityDataRetrievalServiceFactory !== null ) {
+   $table = 
$this->entityDataRetrievalServiceFactory->getPropertyInfoLookup();
} else {
$table = $this->getPropertyInfoTable();
}
@@ -620,8 +620,8 @@
 * @return EntityPrefetcher
 */
private function newEntityPrefetcher() {
-   if ( $this->entityDataRetrievalServices !== null ) {
-   return 
$this->entityDataRetrievalServices->getEntityPrefetcher();
+   if ( $this->entityDataRetrievalServiceFactory !== null ) {
+   return 
$this->entityDataRetrievalServiceFactory->getEntityPrefetcher();
}
return new PrefetchingWikiPageEntityMetaDataAccessor(
new WikiPageEntityMetaDataLookup( 
$this->entityNamespaceLookup )

-- 
To view, visit https://gerrit.wikimedia.org/r/339385
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibc70ff314294f8ca8cecefdb9b0021b2b3748609
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Aude 

___
MediaWiki-commits mailing list