Merge pull request #1410 from avataar/issues/#1409-unnecessary-iri-pa…

…rsing GH-1409: Unnecessary parsing of IRIs every time an RDF parser is used
eclipse-rdf4j · May 17, 2019 · a8323bf · a8323bf
2 parents 62f7889 + 97d0ea1
commit a8323bf
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 23 deletions.
diff --git a/compliance/rio/src/test/java/org/eclipse/rdf4j/rio/turtle/CustomTurtleParserTest.java b/compliance/rio/src/test/java/org/eclipse/rdf4j/rio/turtle/CustomTurtleParserTest.java
@@ -440,8 +440,7 @@ public void test780IRISpace() throws Exception {
 		assertEquals(1, model.size());
 		model.filter(null, RDF.TYPE, null)
 				.objects()
-				.forEach(obj -> assertEquals("http://purl.bioontology.org/ontology/UATC/%20SERINE%20%20",
-						obj.stringValue()));
+				.forEach(obj -> assertEquals("http://purl.bioontology.org/ontology/UATC/ SERINE  ", obj.stringValue()));
 	}
 
 	@Test

diff --git a/rio/api/src/main/java/org/eclipse/rdf4j/rio/helpers/AbstractRDFParser.java b/rio/api/src/main/java/org/eclipse/rdf4j/rio/helpers/AbstractRDFParser.java
@@ -367,38 +367,24 @@ protected void clearBNodeIDMap() {
 	 * Resolves a URI-string against the base URI and creates a {@link IRI} object for it.
 	 */
 	protected IRI resolveURI(String uriSpec) throws RDFParseException {
-		// Resolve relative URIs against base URI
-		ParsedIRI uri;
-		try {
-			uri = new ParsedIRI(uriSpec);
-		} catch (URISyntaxException e) {
-			reportError("Invalid IRI '" + uriSpec, BasicParserSettings.VERIFY_URI_SYNTAX);
-			try {
-				uri = ParsedIRI.create(uriSpec);
-			} catch (IllegalArgumentException ex) {
-				if (getParserConfig().isNonFatalError(BasicParserSettings.VERIFY_URI_SYNTAX)) {
-					return null;
-				}
-				return valueFactory.createIRI(uriSpec);
-			}
-		}
-
-		if (!uri.isAbsolute()) {
+		if (uriSpec.indexOf(':') < 0) {
+			// Resolve relative URIs against base URI
 			if (baseURI == null) {
 				reportFatalError("Unable to resolve URIs, no base URI has been set");
 			}
 
 			if (getParserConfig().get(BasicParserSettings.VERIFY_RELATIVE_URIS)) {
-				if (!uri.isAbsolute() && uriSpec.length() > 0 && !uriSpec.startsWith("#") && baseURI.isOpaque()) {
+				if (uriSpec.length() > 0 && !uriSpec.startsWith("#") && baseURI.isOpaque()) {
 					reportError("Relative URI '" + uriSpec + "' cannot be resolved using the opaque base URI '"
 							+ baseURI + "'", BasicParserSettings.VERIFY_RELATIVE_URIS);
 				}
 			}
 
-			uri = baseURI.resolve(uri);
+			return createURI(baseURI.resolve(uriSpec));
+		} else {
+			// URI is not relative
+			return createURI(uriSpec);
 		}
-
-		return createURI(uri.toString());
 	}
 
 	/**
@@ -410,6 +396,7 @@ protected IRI createURI(String uri) throws RDFParseException {
 				new ParsedIRI(uri);
 			} catch (URISyntaxException e) {
 				reportError(e.getMessage(), BasicParserSettings.VERIFY_URI_SYNTAX);
+				return null;
 			}
 		}
 		try {