jenkins-bot has submitted this change and it was merged.
Change subject: Move EntityData* to LinkedData namespace and dir
......................................................................
Move EntityData* to LinkedData namespace and dir
Change-Id: Iaa70df827adcd93ef5574708ca861d48f14d3e70
---
M repo/Wikibase.classes.php
M repo/Wikibase.hooks.php
R repo/includes/LinkedData/EntityDataRequestHandler.php
R repo/includes/LinkedData/EntityDataSerializationService.php
M repo/includes/specials/SpecialEntityData.php
R repo/tests/phpunit/includes/LinkedData/EntityDataRequestHandlerTest.php
R repo/tests/phpunit/includes/LinkedData/EntityDataSerializationServiceTest.php
R repo/tests/phpunit/includes/LinkedData/EntityDataTestProvider.php
8 files changed, 36 insertions(+), 38 deletions(-)
Approvals:
Aude: Looks good to me, approved
jenkins-bot: Verified
diff --git a/repo/Wikibase.classes.php b/repo/Wikibase.classes.php
index b7e9fad..f845560 100644
--- a/repo/Wikibase.classes.php
+++ b/repo/Wikibase.classes.php
@@ -125,8 +125,8 @@
'SpecialListDatatypes' =>
'includes/specials/SpecialListDatatypes.php',
'SpecialDispatchStats' =>
'includes/specials/SpecialDispatchStats.php',
'SpecialEntityData' =>
'includes/specials/SpecialEntityData.php',
- 'Wikibase\EntityDataSerializationService' =>
'includes/specials/EntityDataSerializationService.php',
- 'Wikibase\EntityDataRequestHandler' =>
'includes/specials/EntityDataRequestHandler.php',
+ 'Wikibase\LinkedData\EntityDataSerializationService' =>
'includes/LinkedData/EntityDataSerializationService.php',
+ 'Wikibase\LinkedData\EntityDataRequestHandler' =>
'includes/LinkedData/EntityDataRequestHandler.php',
// includes/store
'Wikibase\EntityPerPage' => 'includes/store/EntityPerPage.php',
@@ -165,9 +165,9 @@
'ObservableMessageReporter' => 'includes/MessageReporter.php',
'NullMessageReporter' => 'includes/MessageReporter.php',
- 'Wikibase\Test\EntityDataSerializationServiceTest' =>
'tests/phpunit/includes/specials/EntityDataSerializationServiceTest.php',
- 'Wikibase\Test\EntityDataRequestHandlerTest' =>
'tests/phpunit/includes/specials/EntityDataRequestHandlerTest.php',
- 'Wikibase\Test\EntityDataTestProvider' =>
'tests/phpunit/includes/specials/EntityDataTestProvider.php',
+ 'Wikibase\Test\EntityDataSerializationServiceTest' =>
'tests/phpunit/includes/LinkedData/EntityDataSerializationServiceTest.php',
+ 'Wikibase\Test\EntityDataRequestHandlerTest' =>
'tests/phpunit/includes/LinkedData/EntityDataRequestHandlerTest.php',
+ 'Wikibase\Test\EntityDataTestProvider' =>
'tests/phpunit/includes/LinkedData/EntityDataTestProvider.php',
);
diff --git a/repo/Wikibase.hooks.php b/repo/Wikibase.hooks.php
index 8b8d3fb..b083e84 100644
--- a/repo/Wikibase.hooks.php
+++ b/repo/Wikibase.hooks.php
@@ -199,6 +199,9 @@
'content/PropertyContent',
'content/PropertyHandler',
+ 'LinkedData/EntityDataSerializationService',
+ 'LinkedData/EntityDataRequestHandler',
+
'rdf/RdfBuilder',
'rdf/RdfSerializer',
@@ -210,9 +213,6 @@
'specials/SpecialSetDescription',
'specials/SpecialSetLabel',
'specials/SpecialSetAliases',
-
- 'specials/EntityDataSerializationService',
- 'specials/EntityDataRequestHandler',
'store/IdGenerator',
'store/StoreFactory',
diff --git a/repo/includes/specials/EntityDataRequestHandler.php
b/repo/includes/LinkedData/EntityDataRequestHandler.php
similarity index 98%
rename from repo/includes/specials/EntityDataRequestHandler.php
rename to repo/includes/LinkedData/EntityDataRequestHandler.php
index f45222d..58dad03 100644
--- a/repo/includes/specials/EntityDataRequestHandler.php
+++ b/repo/includes/LinkedData/EntityDataRequestHandler.php
@@ -1,7 +1,11 @@
<?php
-namespace Wikibase;
+namespace Wikibase\LinkedData;
use DataTypes\DataTypeFactory;
+use Wikibase\EntityContentFactory;
+use Wikibase\EntityId;
+use Wikibase\HttpAcceptNegotiator;
+use Wikibase\HttpAcceptParser;
use \Wikibase\Lib\EntityIdParser;
use \Wikibase\Lib\EntityIdFormatter;
use \Title;
@@ -362,7 +366,7 @@
public function httpContentNegotiation( WebRequest $request, OutputPage
$output, EntityId $id, $revision = 0 ) {
$headers = $request->getAllHeaders();
if ( isset( $headers['ACCEPT'] ) ) {
- $parser = new \Wikibase\HttpAcceptParser();
+ $parser = new HttpAcceptParser();
$accept = $parser->parseWeights( $headers['ACCEPT'] );
} else {
// anything goes
@@ -382,7 +386,7 @@
$mimeTypes =
$this->serializationService->getSupportedMimeTypes();
$mimeTypes[] = 'text/html'; // HTML is handled by the normal
page URL
- $negotiator = new \Wikibase\HttpAcceptNegotiator( $mimeTypes );
+ $negotiator = new HttpAcceptNegotiator( $mimeTypes );
$format = $negotiator->getBestSupportedKey( $accept, null );
if ( $format === null ) {
diff --git a/repo/includes/specials/EntityDataSerializationService.php
b/repo/includes/LinkedData/EntityDataSerializationService.php
similarity index 98%
rename from repo/includes/specials/EntityDataSerializationService.php
rename to repo/includes/LinkedData/EntityDataSerializationService.php
index 2a5c810..781dee5 100644
--- a/repo/includes/specials/EntityDataSerializationService.php
+++ b/repo/includes/LinkedData/EntityDataSerializationService.php
@@ -1,8 +1,10 @@
<?php
-namespace Wikibase;
+namespace Wikibase\LinkedData;
use \DataTypes\DataTypeFactory;
+use Wikibase\Entity;
+use Wikibase\EntityLookup;
use \Wikibase\Lib\EntityIdFormatter;
use \MWException;
use \EasyRdf_Format;
@@ -16,6 +18,7 @@
use \RequestContext;
use Wikibase\Lib\Serializers\EntitySerializationOptions;
use Wikibase\Lib\Serializers\SerializerFactory;
+use Wikibase\RdfSerializer;
/**
* Service for serializing entity data.
@@ -455,7 +458,7 @@
* @param string $formatName The desired serialization format,
* as a format name understood by ApiBase or EasyRdf_Format
*
- * @return ApiFormatBase|null A suitable result printer, or null
+ * @return \ApiFormatBase|null A suitable result printer, or null
* if the given format is not supported by the API.
*/
public function createApiSerializer( $formatName ) {
diff --git a/repo/includes/specials/SpecialEntityData.php
b/repo/includes/specials/SpecialEntityData.php
index 3b46b77..6a400a1 100644
--- a/repo/includes/specials/SpecialEntityData.php
+++ b/repo/includes/specials/SpecialEntityData.php
@@ -1,13 +1,13 @@
<?php
use DataTypes\DataTypeFactory;
-use Wikibase\EntityDataRequestHandler;
-use \Wikibase\Lib\EntityIdParser;
-use \Wikibase\Lib\EntityIdFormatter;
-use \Wikibase\EntityContent;
-use \Wikibase\EntityContentFactory;
-use \Wikibase\RdfSerializer;
-use \Wikibase\EntityDataSerializationService;
+use Wikibase\Lib\EntityIdParser;
+use Wikibase\Lib\EntityIdFormatter;
+use Wikibase\EntityContent;
+use Wikibase\EntityContentFactory;
+use Wikibase\LinkedData\EntityDataRequestHandler;
+use Wikibase\LinkedData\EntityDataSerializationService;
+use Wikibase\RdfSerializer;
/**
* Special page to act as a data endpoint for the linked data web.
@@ -72,7 +72,7 @@
$defaultFormat = empty( $formats ) ? 'html' : $formats[0];
- $this->requestHandler = new \Wikibase\EntityDataRequestHandler(
+ $this->requestHandler = new EntityDataRequestHandler(
$this->getTitle(),
$entityContentFactory,
$entityIdParser,
@@ -117,13 +117,5 @@
//TODO: show input form with selector for format and field for
ID. Add some explanation,
// point to meta-info like schema and license, and
generally be a helpful data endpoint.
$this->getOutput()->showErrorPage( 'wikibase-entitydata-title',
'wikibase-entitydata-text' );
- }
-
- /**
- * Returns true iff RDF output is supported.
- * @return bool
- */
- public function isRdfSupported() {
- return $this->service->isRdfSupported();
}
}
diff --git
a/repo/tests/phpunit/includes/specials/EntityDataRequestHandlerTest.php
b/repo/tests/phpunit/includes/LinkedData/EntityDataRequestHandlerTest.php
similarity index 96%
rename from
repo/tests/phpunit/includes/specials/EntityDataRequestHandlerTest.php
rename to
repo/tests/phpunit/includes/LinkedData/EntityDataRequestHandlerTest.php
index b003898..896778c 100644
--- a/repo/tests/phpunit/includes/specials/EntityDataRequestHandlerTest.php
+++ b/repo/tests/phpunit/includes/LinkedData/EntityDataRequestHandlerTest.php
@@ -8,16 +8,16 @@
use ValueParsers\ParserOptions;
use Wikibase\Entity;
use Wikibase\EntityContentFactory;
-use Wikibase\EntityDataSerializationService;
-use \Wikibase\Item;
-use \Wikibase\ItemContent;
-use \Wikibase\EntityDataRequestHandler;
+use Wikibase\Item;
+use Wikibase\ItemContent;
use Wikibase\Lib\EntityIdFormatter;
use Wikibase\Lib\EntityIdParser;
+use Wikibase\LinkedData\EntityDataSerializationService;
+use Wikibase\LinkedData\EntityDataRequestHandler;
use Wikibase\Property;
/**
- * @covers \Wikibase\EntityDataRequestHandler
+ * @covers \Wikibase\LinkedData\EntityDataRequestHandler
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git
a/repo/tests/phpunit/includes/specials/EntityDataSerializationServiceTest.php
b/repo/tests/phpunit/includes/LinkedData/EntityDataSerializationServiceTest.php
similarity index 97%
rename from
repo/tests/phpunit/includes/specials/EntityDataSerializationServiceTest.php
rename to
repo/tests/phpunit/includes/LinkedData/EntityDataSerializationServiceTest.php
index 8a9e2f9..248edd3 100644
---
a/repo/tests/phpunit/includes/specials/EntityDataSerializationServiceTest.php
+++
b/repo/tests/phpunit/includes/LinkedData/EntityDataSerializationServiceTest.php
@@ -6,14 +6,13 @@
use Revision;
use ValueFormatters\FormatterOptions;
use Wikibase\Entity;
-use Wikibase\EntityDataSerializationService;
-use \Wikibase\Item;
-use \Wikibase\ItemContent;
+use Wikibase\Item;
use Wikibase\Lib\EntityIdFormatter;
+use Wikibase\LinkedData\EntityDataSerializationService;
use Wikibase\Property;
/**
- * @covers \Wikibase\EntityDataSerializationService
+ * @covers \Wikibase\LinkedData\EntityDataSerializationService
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/repo/tests/phpunit/includes/specials/EntityDataTestProvider.php
b/repo/tests/phpunit/includes/LinkedData/EntityDataTestProvider.php
similarity index 100%
rename from repo/tests/phpunit/includes/specials/EntityDataTestProvider.php
rename to repo/tests/phpunit/includes/LinkedData/EntityDataTestProvider.php
--
To view, visit https://gerrit.wikimedia.org/r/67099
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iaa70df827adcd93ef5574708ca861d48f14d3e70
Gerrit-PatchSet: 6
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Daniel Kinzler <[email protected]>
Gerrit-Reviewer: Aude <[email protected]>
Gerrit-Reviewer: Daniel Kinzler <[email protected]>
Gerrit-Reviewer: Jeroen De Dauw <[email protected]>
Gerrit-Reviewer: Tobias Gritschacher <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
