Skip to content

Fix IRI namespace and local name guessing #172

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
prbblrypier merged 1 commit into from
Jul 16, 2025
Merged

Fix IRI namespace and local name guessing #172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions src/main/java/fr/inria/corese/core/next/impl/common/util/IRIUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public class IRIUtils {

private static final Logger logger = LoggerFactory.getLogger(IRIUtils.class);

private static final Pattern IRI_PATTERN = Pattern.compile("^(([\\w\\-]+:\\/\\/([\\w\\-_:]+\\.)*[\\w\\-_:]*)(\\/([\\w\\-\\._\\:]+\\/)*))([\\w\\-\\._\\:]+)(\\?[\\w\\-_\\:\\?\\=]+)?((\\#)?([\\w\\-_]+))?$");
private static final Pattern IRI_PATTERN = Pattern.compile("^(([\\w\\-]+:\\/\\/([\\w\\-_:]+\\.)*[\\w\\-_:]*)(\\/([\\w\\-\\._\\:]+\\/)*))([\\w\\-\\._\\:]+)?(\\?[\\w\\-_\\:\\?\\=]+)?((\\#)?([\\w\\-_]+))?$");
private static final Pattern STANDARD_IRI_PATTERN = Pattern.compile("^(([^:/?#\\s]+):)(\\/\\/([^/?#\\s]*))?([^?#\\s]*)(\\?([^#\\s]*))?(#(.*))?");

/**
Expand All @@ -34,9 +34,11 @@ public static String guessNamespace(String iri) {
Matcher matcher = IRI_PATTERN.matcher(iri);

if(matcher.matches()) {
if(matcher.group(8) == null ) { // If the IRI has no fragment)
if((matcher.group(8) == null) || (matcher.group(6) == null && matcher.group(9) == null) ) { // If the IRI has no fragment or ends with a slash

return matcher.group(1);
} else {
// 1: Domain and path ending with a slash, 6: final path element without slash, 9: final # if there is a fragment
return matcher.group(1) + matcher.group(6) + matcher.group(9);
}
} else {
Expand All @@ -57,10 +59,12 @@ public static String guessLocalName(String iri) {
Matcher matcher = IRI_PATTERN.matcher(iri);

if(matcher.matches()) {
if(matcher.group(8) == null ) { // If the IRI has no fragment)
return matcher.group(6);
} else {
if(matcher.group(10) != null){ // If the IRI has a fragment
return matcher.group(10);
} else if(matcher.group(6) != null ) { // If the IRI has no fragment but do not ends with a slash
return matcher.group(6);
} else { // If the URI ends with a slash
return "";
}
} else {
return "";
Expand Down
7 changes: 7 additions & 0 deletions src/test/java/fr/inria/corese/core/next/impl/temp/CoreseAdaptedValueFactoryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,4 +125,11 @@ public void testCreateStatementWithContext() {
assertEquals(literal, statement.getObject());
assertEquals(context, statement.getContext());
}

@Test
public void testCreateFOAFURI() {
IRI foaf = valueFactory.createIRI("http://xmlns.com/foaf/0.1/");
assertNotNull(foaf);
assertEquals("http://xmlns.com/foaf/0.1/", foaf.stringValue());
}
}