You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2025/01/23 11:46:46 UTC
(jena) 03/06: Tidy up the IRI validator
This is an automated email from the ASF dual-hosted git repository.
andy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/jena.git
commit 97342db20ff14db2d8b378b6f47ad9c7f7a7f17b
Author: Andy Seaborne <an...@apache.org>
AuthorDate: Sat Jan 18 10:06:37 2025 +0000
Tidy up the IRI validator
---
.../apache/jena/iri3986/provider/JenaSeveritySettings.java | 6 +++---
.../apache/jena/fuseki/validation/html/IRIValidatorHTML.java | 12 ++++++++----
2 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/jena-core/src/main/java/org/apache/jena/iri3986/provider/JenaSeveritySettings.java b/jena-core/src/main/java/org/apache/jena/iri3986/provider/JenaSeveritySettings.java
index 3baa20f5b7..f185e1dd0b 100644
--- a/jena-core/src/main/java/org/apache/jena/iri3986/provider/JenaSeveritySettings.java
+++ b/jena-core/src/main/java/org/apache/jena/iri3986/provider/JenaSeveritySettings.java
@@ -78,12 +78,12 @@ public class JenaSeveritySettings {
SeverityMap.setSeverity(severityMap, Issue.file_bad_form, Severity.WARNING);
SeverityMap.setSeverity(severityMap, Issue.file_relative_path, Severity.WARNING);
- // did
+ // DID
SeverityMap.setSeverity(severityMap, Issue.did_bad_syntax, Severity.ERROR);
+
// OID
SeverityMap.setSeverity(severityMap, Issue.oid_bad_syntax, Severity.ERROR);
- // OID
- SeverityMap.setSeverity(severityMap, Issue.oid_scheme_not_registered, Severity.WARNING);
+ SeverityMap.setSeverity(severityMap, Issue.oid_scheme_not_registered, Severity.WARNING);
return SeverityMap.create("Jena settings", severityMap);
}
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/validation/html/IRIValidatorHTML.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/validation/html/IRIValidatorHTML.java
index 003b4aabc3..1e801aeed1 100644
--- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/validation/html/IRIValidatorHTML.java
+++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/validation/html/IRIValidatorHTML.java
@@ -79,10 +79,14 @@ public class IRIValidatorHTML
if ( iri.isRelative() )
System.out.println("Relative IRI: " + iriStr);
- iri.handleViolations((error,msg)->{
- String str = htmlQuote(msg);
- System.out.println(str);
- });
+ if ( iri.hasViolations() ) {
+ System.out.println();
+ iri.handleViolations((error,msg)->{
+ String str = htmlQuote(msg);
+ String category = (error)?"Error":"Warning";
+ System.out.printf(" %-7s : %s\n", category, str);
+ });
+ }
} catch (IRIException ex) {
System.out.println(iriStr);
System.out.println("Bad IRI: "+ex.getMessage());