WARN if any subjects are missing 'rdf:type', DM2E/dm2e-mappings#87

DM2E · Apr 7, 2014 · de50b43 · de50b43
1 parent 5a6e467
commit de50b43
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 3 deletions.
diff --git a/src/main/java/eu/dm2e/validation/ValidationProblemCategory.java b/src/main/java/eu/dm2e/validation/ValidationProblemCategory.java
@@ -7,6 +7,8 @@ public enum ValidationProblemCategory {
 	MISSING_CONDITIONALLY_REQUIRED_PROPERTY(" is missing required property <%s> (Condition: %s)"),
 	MISSING_REQUIRED_ONE_OF(" is missing one of %s"),
 	MISSING_CONDITIONALLY_REQUIRED_ONE_OF(" is missing required property <%s> (Condition: %s)"),
+
+	UNTYPED_RESOURCE(" has no rdf:type."),
 
 	INVALID_LITERAL(" Invalid literal value for <%s>: '%s' (%s)"),
 	BAD_MIMETYPE(" has unsupported MIME type '%s'."),

diff --git a/src/main/java/eu/dm2e/validation/validator/BaseValidator.java b/src/main/java/eu/dm2e/validation/validator/BaseValidator.java
@@ -344,27 +344,54 @@ protected void checkStatement(final Statement stmt, Dm2eValidationReport report)
 
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * reg-name = *( unreserved / pct-encoded / sub-delims )
+	 * 
+	 * unreserved = ALPHA / DIGIT / "-" / "." / "_" / "~" <---This seems like a
+	 * practical shortcut, most closely resembling original answer
+	 * 
+	 * reserved = gen-delims / sub-delims
+	 * 
+	 * gen-delims = ":" / "/" / "?" / "#" / "[" / "]" / "@"
+	 * 
+	 * sub-delims = "!" / "$" / "&" / "'" / "(" / ")" / "*" / "+" / "," / ";" /
+	 * "="
+	 * 
+	 * pct-encoded = "%" HEXDIG HEXDIG
+	 */
 	@Override
 	public Set<String> build_illegal_Uri_Strings() {
 		Set<String> ret = new HashSet<>();
 		ret.add("\r");
 		ret.add("\n");
 		ret.add("\t");
 		ret.add(":");
+		ret.add("[");
+		ret.add("]");
+		ret.add("!");
+		ret.add("$");
+		ret.add("'");
+		ret.add("(");
+		ret.add(")");
+		ret.add("*");
+		ret.add(",");
+		ret.add(";");
+		ret.add("{");
+		ret.add("}");
 		ret.add("<");
 		ret.add(">");
-		ret.add("+");
 		ret.add(" ");
 		ret.add("^");
 //		ret.add("?");
+//		ret.add("&");
 		ret.add("%2F"); // == '/'
 		ret.add("%0D");	// == '\r'
 		ret.add("%0A");	// == '\n'
 		ret.add("%09");	// == '\t'
-//		ret.add("%3A");	// == ':'
 		ret.add("%3C");	// == '<'
 		ret.add("%3E");	// == '>'
-//		ret.add("%3F");	// == '?'
 		return ret;
 	}
 
@@ -732,6 +759,14 @@ public Dm2eValidationReport validateWithDm2e(Model m) {
 
 		Dm2eValidationReport report = new Dm2eValidationReport(getVersion());
 
+		// Check that every subject has a rdf:type
+		ResIterator iter = m.listSubjects();
+		while (iter.hasNext()) {
+			Resource subj = iter.next();
+			if (! m.contains(subj, prop(m, NS.RDF.PROP_TYPE), (Resource)null)) {
+				report.add(ValidationLevel.WARNING, ValidationProblemCategory.UNTYPED_RESOURCE, subj);
+			}
+		}
 		// * check unknown elements
 		validateByStatement(m, report);
 

diff --git a/src/test/java/eu/dm2e/validation/validator/BaseValidatorTest.java b/src/test/java/eu/dm2e/validation/validator/BaseValidatorTest.java
@@ -30,6 +30,18 @@ public class BaseValidatorTest extends ValidationTest {
 	// Tests
 	//
 
+	@Test
+	public void testIssue85() throws Exception {
+		Model m = ModelFactory.createDefaultModel();
+		final Resource testAgg = res(m, "http://agg1");
+		final Resource testCho = res(m, "http://cho1");
+		testAgg.addProperty(prop(m, NS.EDM.PROP_AGGREGATED_CHO), testCho);
+		Dm2eValidationReport report = v1_1_rev1_2.validateWithDm2e(m);
+		ValidationProblemCategory expected = ValidationProblemCategory.UNTYPED_RESOURCE;
+		log.debug(report.toString());
+		containsCategory(report, expected);
+	}
+
 	@Test
     @Ignore
 	public void testPropertyWhiteList() {