s434730/RandomSec
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Reorganize scrutinizers to simplify the methods

Browse Source
This commit is contained in:
Antonin Delpeuch 2018-01-09 10:20:22 +00:00
parent 2795a54ea2
commit b5f2085038
5 changed files with 38 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
extensions/wikidata/src/org/openrefine/wikidata/operations/SaveWikibaseSchemaOperation.java
View File

@ -39,14 +39,6 @@ public class SaveWikibaseSchemaOperation extends AbstractOperation {
static public AbstractOperation reconstruct(Project project, JSONObject obj)
throws Exception {
System.out.println("Attempting to reconstruct save op");
try {
System.out.println(WikibaseSchema.reconstruct(obj.getJSONObject("schema")).toString());
} catch(Exception e) {
System.out.println("Failed to reconstruct");
e.printStackTrace();
}
System.out.println("SUCCESS");
return new SaveWikibaseSchemaOperation(WikibaseSchema.reconstruct(obj
.getJSONObject("schema")));
}

16
extensions/wikidata/src/org/openrefine/wikidata/qa/scrutinizers/ItemEditScrutinizer.java
View File

@ -13,7 +13,21 @@ public abstract class ItemEditScrutinizer extends EditScrutinizer {
scrutinize(update);
}
}
batchIsFinished();
}
public abstract void scrutinize(ItemUpdate update);
/**
* Method to be overridden by subclasses to scrutinize
* an individual item update.
* @param update
*/
public abstract void scrutinize(ItemUpdate update);
/**
* Method to be overridden by subclasses to emit warnings
* once a batch has been completely analyzed.
*/
public void batchIsFinished() {
;
}
}

2
extensions/wikidata/src/org/openrefine/wikidata/qa/scrutinizers/NewItemScrutinizer.java
View File

@ -15,7 +15,7 @@ public class NewItemScrutinizer extends ItemEditScrutinizer {
info("new-item-created");
if (update.getLabels().isEmpty() && update.getAliases().isEmpty()) {
important("new-item-without-labels-or-aliases");
critical("new-item-without-labels-or-aliases");
}
if (update.getDescriptions().isEmpty()) {

35
extensions/wikidata/src/org/openrefine/wikidata/qa/scrutinizers/SnakScrutinizer.java
View File

@ -2,52 +2,33 @@ package org.openrefine.wikidata.qa.scrutinizers;
import java.util.Iterator;
import org.wikidata.wdtk.datamodel.interfaces.EntityIdValue;
import org.wikidata.wdtk.datamodel.interfaces.Reference;
import org.wikidata.wdtk.datamodel.interfaces.Snak;
import org.wikidata.wdtk.datamodel.interfaces.Statement;
public abstract class SnakScrutinizer extends StatementScrutinizer {
public abstract void scrutinizeAdded(Snak snak);
public abstract void scrutinizeDeleted(Snak snak);
public abstract void scrutinize(Snak snak, boolean added);
@Override
public void scrutinizeAdded(Statement statement) {
public void scrutinize(Statement statement, EntityIdValue entityId, boolean added) {
// Main snak
scrutinizeAdded(statement.getClaim().getMainSnak());
scrutinize(statement.getClaim().getMainSnak(), added);
// Qualifiers
scrutinizeSnakSet(statement.getClaim().getAllQualifiers(), true);
scrutinizeSnakSet(statement.getClaim().getAllQualifiers(), added);
// References
for(Reference ref : statement.getReferences()) {
scrutinizeSnakSet(ref.getAllSnaks(), true);
}
}
@Override
public void scrutinizeDeleted(Statement statement) {
// Main snak
scrutinizeDeleted(statement.getClaim().getMainSnak());
// Qualifiers
scrutinizeSnakSet(statement.getClaim().getAllQualifiers(), false);
// References
for(Reference ref : statement.getReferences()) {
scrutinizeSnakSet(ref.getAllSnaks(), false);
scrutinizeSnakSet(ref.getAllSnaks(), added);
}
}
private void scrutinizeSnakSet(Iterator<Snak> snaks, boolean add) {
private void scrutinizeSnakSet(Iterator<Snak> snaks, boolean added) {
while(snaks.hasNext()) {
Snak snak = snaks.next();
if (add) {
scrutinizeAdded(snak);
} else {
scrutinizeDeleted(snak);
}
scrutinize(snak, added);
}
}
}

18
extensions/wikidata/src/org/openrefine/wikidata/qa/scrutinizers/StatementScrutinizer.java
View File

@ -1,18 +1,28 @@
package org.openrefine.wikidata.qa.scrutinizers;
import org.openrefine.wikidata.schema.ItemUpdate;
import org.wikidata.wdtk.datamodel.interfaces.EntityIdValue;
import org.wikidata.wdtk.datamodel.interfaces.Statement;
public abstract class StatementScrutinizer extends ItemEditScrutinizer {
@Override
public void scrutinize(ItemUpdate update) {
EntityIdValue currentEntityId = update.getItemId();
for(Statement statement : update.getAddedStatements()) {
scrutinizeAdded(statement);
scrutinize(statement, currentEntityId, true);
}
for (Statement statement : update.getDeletedStatements()) {
scrutinize(statement, currentEntityId, false);
}
}
public abstract void scrutinizeAdded(Statement statement);
public abstract void scrutinizeDeleted(Statement statement);
/**
* The method that should be overridden by subclasses, implementing
* the checks on one statement
* @param statement: the statement to scrutinize
* @param entityId: the id of the entity on which this statement is made or removed
* @param added: whether this statement was added or deleted
*/
public abstract void scrutinize(Statement statement, EntityIdValue entityId, boolean added);
}