Smalyshev has uploaded a new change for review.
https://gerrit.wikimedia.org/r/283004
Change subject: Make Wikibase URIs configurable
......................................................................
Make Wikibase URIs configurable
Bug: T132089
Change-Id: I0998c7e89725825f8e14d12af50cbe080ef6375a
---
M common/src/main/java/org/wikidata/query/rdf/common/uri/WikibaseUris.java
M tools/src/test/java/org/wikidata/query/rdf/tool/MungeIntegrationTest.java
M tools/src/test/java/org/wikidata/query/rdf/tool/test.ttl
3 files changed, 20 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/rdf
refs/changes/04/283004/1
diff --git
a/common/src/main/java/org/wikidata/query/rdf/common/uri/WikibaseUris.java
b/common/src/main/java/org/wikidata/query/rdf/common/uri/WikibaseUris.java
index d577e1d..66b13a9 100644
--- a/common/src/main/java/org/wikidata/query/rdf/common/uri/WikibaseUris.java
+++ b/common/src/main/java/org/wikidata/query/rdf/common/uri/WikibaseUris.java
@@ -8,10 +8,17 @@
* A WikibaseUris instance for wikidata.org.
*/
public static final WikibaseUris WIKIDATA = new
WikibaseUris("www.wikidata.org");
+
/**
- * A WikibaseUris instance for test.wikidata.org.
+ * Configuration for wikibase host.
*/
- public static final WikibaseUris TEST_WIKIDATA = new
WikibaseUris("test.wikidata.org");
+ public static final String WIKIBASE_HOST_PROPERTY = "wikibaseHost";
+
+ /**
+ * Current URI system.
+ * This is static since each instance has only one URI system.
+ */
+ private static WikibaseUris uriSystem;
/**
* Property types used in the ontology.
@@ -224,10 +231,16 @@
/**
* Return current URI system.
- * @return
+ * @return Current URI system.
*/
public static WikibaseUris getURISystem() {
- // FIXME: make it possible to configure URI system here
- return WIKIDATA;
+ if (uriSystem == null) {
+ if (System.getProperty(WIKIBASE_HOST_PROPERTY) != null) {
+ uriSystem = new
WikibaseUris(System.getProperty(WIKIBASE_HOST_PROPERTY));
+ } else {
+ uriSystem = WIKIDATA;
+ }
+ }
+ return uriSystem;
}
}
diff --git
a/tools/src/test/java/org/wikidata/query/rdf/tool/MungeIntegrationTest.java
b/tools/src/test/java/org/wikidata/query/rdf/tool/MungeIntegrationTest.java
index 0e96c27..d4257d3 100644
--- a/tools/src/test/java/org/wikidata/query/rdf/tool/MungeIntegrationTest.java
+++ b/tools/src/test/java/org/wikidata/query/rdf/tool/MungeIntegrationTest.java
@@ -38,7 +38,7 @@
private static final Logger log =
LoggerFactory.getLogger(MungeIntegrationTest.class);
public MungeIntegrationTest() {
- super(WikibaseUris.TEST_WIKIDATA);
+ super(new WikibaseUris("test.wikidata.org"));
}
/**
diff --git a/tools/src/test/java/org/wikidata/query/rdf/tool/test.ttl
b/tools/src/test/java/org/wikidata/query/rdf/tool/test.ttl
index bf88a1b..bb5cc24 100644
--- a/tools/src/test/java/org/wikidata/query/rdf/tool/test.ttl
+++ b/tools/src/test/java/org/wikidata/query/rdf/tool/test.ttl
@@ -2,7 +2,7 @@
@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
@prefix owl: <http://www.w3.org/2002/07/owl#> .
-@prefix wikibase: <http://www.wikidata.org/ontology-beta#> .
+@prefix wikibase: <http://wikiba.se/ontology-beta#> .
@prefix wdata: <https://test.wikidata.org/wiki/Special:EntityData/> .
@prefix wd: <http://test.wikidata.org/entity/> .
@prefix wds: <http://test.wikidata.org/entity/statement/> .
--
To view, visit https://gerrit.wikimedia.org/r/283004
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0998c7e89725825f8e14d12af50cbe080ef6375a
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/rdf
Gerrit-Branch: master
Gerrit-Owner: Smalyshev <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
