Hjfocs has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/365219 )
Change subject: Move RDF data model validation to the 'primarysources' package
......................................................................
Move RDF data model validation to the 'primarysources' package
Change-Id: I39588b21a0467964237d7ebc36f5823c8a096b90
---
R
tools/src/main/java/org/wikidata/query/rdf/tool/primarysources/WikibaseDataModelValidator.java
R
tools/src/test/java/org/wikidata/query/rdf/tool/primarysources/WikibaseDataModelValidatorUnitTest.java
2 files changed, 8 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/rdf
refs/changes/19/365219/1
diff --git
a/tools/src/main/java/org/wikidata/query/rdf/tool/rdf/WikibaseDataModelValidator.java
b/tools/src/main/java/org/wikidata/query/rdf/tool/primarysources/WikibaseDataModelValidator.java
similarity index 98%
rename from
tools/src/main/java/org/wikidata/query/rdf/tool/rdf/WikibaseDataModelValidator.java
rename to
tools/src/main/java/org/wikidata/query/rdf/tool/primarysources/WikibaseDataModelValidator.java
index 93f37a2..153283b 100644
---
a/tools/src/main/java/org/wikidata/query/rdf/tool/rdf/WikibaseDataModelValidator.java
+++
b/tools/src/main/java/org/wikidata/query/rdf/tool/primarysources/WikibaseDataModelValidator.java
@@ -1,4 +1,4 @@
-package org.wikidata.query.rdf.tool.rdf;
+package org.wikidata.query.rdf.tool.primarysources;
import com.google.common.collect.ImmutableMap;
import org.openrdf.model.Model;
@@ -18,6 +18,7 @@
import java.io.InputStream;
import java.net.HttpURLConnection;
import java.net.URL;
+import java.util.AbstractMap;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@@ -277,7 +278,7 @@
* @param dataset - the RDF dataset to be validated, which has already
undergone syntax check
* @return a sub-set of the input dataset, pruned from invalid triples
*/
- public Model handleDataset(Model dataset) {
+ public AbstractMap.SimpleImmutableEntry<Model, List<String>>
handleDataset(Model dataset) {
Model valid = new TreeModel();
List<String> invalid = new ArrayList<>();
Iterator<Statement> statementIterator = dataset.iterator();
@@ -290,7 +291,7 @@
} else {
log.warn("Your dataset has issues, only valid triples will be
uploaded. List of invalid triples: {}", invalid);
}
- return valid;
+ return new AbstractMap.SimpleImmutableEntry<>(valid, invalid);
}
/**
diff --git
a/tools/src/test/java/org/wikidata/query/rdf/tool/rdf/WikibaseDataModelValidatorUnitTest.java
b/tools/src/test/java/org/wikidata/query/rdf/tool/primarysources/WikibaseDataModelValidatorUnitTest.java
similarity index 98%
rename from
tools/src/test/java/org/wikidata/query/rdf/tool/rdf/WikibaseDataModelValidatorUnitTest.java
rename to
tools/src/test/java/org/wikidata/query/rdf/tool/primarysources/WikibaseDataModelValidatorUnitTest.java
index f87b0e4..7b20715 100644
---
a/tools/src/test/java/org/wikidata/query/rdf/tool/rdf/WikibaseDataModelValidatorUnitTest.java
+++
b/tools/src/test/java/org/wikidata/query/rdf/tool/primarysources/WikibaseDataModelValidatorUnitTest.java
@@ -1,4 +1,4 @@
-package org.wikidata.query.rdf.tool.rdf;
+package org.wikidata.query.rdf.tool.primarysources;
import com.carrotsearch.randomizedtesting.RandomizedRunner;
import com.carrotsearch.randomizedtesting.RandomizedTest;
@@ -274,7 +274,7 @@
Resource validSubject = createValidReferenceNode(vf);
URI validProperty =
vf.createURI(WikibaseDataModelValidator.VALID_NAMESPACES.property(WikibaseUris.PropertyType.REFERENCE)
+ "P" + String.valueOf(
randomIntBetween(1, 100000)));
- Value validObject =
vf.createURI("http://www.nndb.com/people/409/000114067/";);
+ Value validObject = vf.createURI("https://en.wikipedia.org";);
// Combine valid and invalid components into a set of test triples
Statement totallyInvalid = vf.createStatement(subjectWithInvalidHash,
propertyWithInvalidNamespace, objectWithInvalidNamespace);
@@ -307,8 +307,8 @@
@Test
public void testHandleDataset() throws Exception {
- Model good = validator.handleDataset(goodParsedDataset);
- Model bad = validator.handleDataset(badParsedDataset);
+ Model good = validator.handleDataset(goodParsedDataset).getKey();
+ Model bad = validator.handleDataset(badParsedDataset).getKey();
assertEquals(goodParsedDataset, good);
assertTrue(Models.isSubset(bad, badParsedDataset));
assertEquals(new TreeModel(), bad);
--
To view, visit https://gerrit.wikimedia.org/r/365219
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I39588b21a0467964237d7ebc36f5823c8a096b90
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/rdf
Gerrit-Branch: master
Gerrit-Owner: Hjfocs <foss...@spaziodati.eu>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
