You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by de...@apache.org on 2015/10/25 11:59:27 UTC
jena git commit: JENA-1030: wrap <>-quotes around bare URIs when
serializing rules
Repository: jena
Updated Branches:
refs/heads/master 85b722be1 -> 5edf18dba
JENA-1030: wrap <>-quotes around bare URIs when serializing rules
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/5edf18db
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/5edf18db
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/5edf18db
Branch: refs/heads/master
Commit: 5edf18dba5091452128cf11cea9975d3e3745c30
Parents: 85b722b
Author: der <da...@epimorphics.com>
Authored: Sun Oct 25 10:58:23 2015 +0000
Committer: der <da...@epimorphics.com>
Committed: Sun Oct 25 10:58:23 2015 +0000
----------------------------------------------------------------------
.../java/org/apache/jena/reasoner/rulesys/Rule.java | 3 ++-
.../src/main/java/org/apache/jena/util/PrintUtil.java | 8 +++++++-
.../apache/jena/reasoner/rulesys/test/TestBasics.java | 14 +++++++-------
.../test/java/org/apache/jena/util/TestPrintUtil.java | 7 ++++---
4 files changed, 20 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/5edf18db/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/Rule.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/Rule.java b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/Rule.java
index 1057489..c0ad540 100755
--- a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/Rule.java
+++ b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/Rule.java
@@ -1094,7 +1094,8 @@ public class Rule implements ClauseEntry {
* during rule parsing.
*/
public static class ParserException extends JenaException {
-
+ private static final long serialVersionUID = -7297703783308663168L;
+
/** constructor */
public ParserException(String message, Parser parser) {
super(constructMessage(message, parser));
http://git-wip-us.apache.org/repos/asf/jena/blob/5edf18db/jena-core/src/main/java/org/apache/jena/util/PrintUtil.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/util/PrintUtil.java b/jena-core/src/main/java/org/apache/jena/util/PrintUtil.java
index 536cfa7..d845370 100755
--- a/jena-core/src/main/java/org/apache/jena/util/PrintUtil.java
+++ b/jena-core/src/main/java/org/apache/jena/util/PrintUtil.java
@@ -102,7 +102,13 @@ public class PrintUtil {
*/
public static String print(Node node) {
if (node instanceof Node_URI) {
- return node.toString( prefixMapping );
+ String uri = ((Node_URI)node).getURI();
+ String suri = prefixMapping == null ? uri : prefixMapping.shortForm(uri);
+ if (uri.equals(suri)) {
+ return "<" + uri + ">";
+ } else {
+ return suri;
+ }
} else if (node instanceof Node_Literal) {
String lf = node.getLiteralLexicalForm();
// RDF 1.1 : Print xsd:string without ^^xsd:string
http://git-wip-us.apache.org/repos/asf/jena/blob/5edf18db/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/TestBasics.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/TestBasics.java b/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/TestBasics.java
index 038f2d3..3d03574 100755
--- a/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/TestBasics.java
+++ b/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/TestBasics.java
@@ -101,7 +101,7 @@ public class TestBasics extends TestCase {
"[ (?a rdf:type ?_) -> (?a rdf:type '42') ]",
"[ (?a rdf:type ?_) -> (?a rdf:type '4.2'^^http://www.w3.org/2001/XMLSchema#float) ]",
"[ (?a rdf:type ?_) -> (?a rdf:type ' fool that,I(am)') ]",
- "[ rule1: (?a rdf:type ?_) -> (?a rdf:type a) ]",
+ "[ rule1: (?a rdf:type ?_) -> (?a rdf:type <a>) ]",
"[ -> print(' ') ]",
"[ -> print(' literal with embedded ' characters ') ]",
"[ -> print(' literal characters ') ]",
@@ -109,7 +109,7 @@ public class TestBasics extends TestCase {
"[ -> print('42'^^http://www.w3.org/2001/XMLSchema#byte) ]",
"[ -> print('42'^^http://www.w3.org/2001/XMLSchema#int) ]",
"[ -> print('42'^^http://foobar#byte) ]",
- "[ -> print(foo://a/file) ]",
+ "[ -> print(<foo://a/file>) ]",
};
PrintUtil.registerPrefix("foobar", "http://foobar#");
@@ -309,11 +309,11 @@ public class TestBasics extends TestCase {
}
out.flush();
- String testString = TestUtil.normalizeWhiteSpace("Rule testRule3 concluded (res p n3) <-\n" +
- " Rule testRule1 concluded (n2 p n3) <-\n" +
- " Fact (n1 p n3)\r\n" +
- " Rule testRule2 concluded (n2 q n3) <-\n" +
- " Fact (n1 q n3)\r\n");
+ String testString = TestUtil.normalizeWhiteSpace("Rule testRule3 concluded (<res> <p> <n3>) <-\n" +
+ " Rule testRule1 concluded (<n2> <p> <n3>) <-\n" +
+ " Fact (<n1> <p> <n3>)\r\n" +
+ " Rule testRule2 concluded (<n2> <q> <n3>) <-\n" +
+ " Fact (<n1> <q> <n3>)\r\n");
assertEquals(testString, TestUtil.normalizeWhiteSpace(outString.getBuffer().toString()));
}
http://git-wip-us.apache.org/repos/asf/jena/blob/5edf18db/jena-core/src/test/java/org/apache/jena/util/TestPrintUtil.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/org/apache/jena/util/TestPrintUtil.java b/jena-core/src/test/java/org/apache/jena/util/TestPrintUtil.java
index b49db6b..8216295 100644
--- a/jena-core/src/test/java/org/apache/jena/util/TestPrintUtil.java
+++ b/jena-core/src/test/java/org/apache/jena/util/TestPrintUtil.java
@@ -44,14 +44,15 @@ public class TestPrintUtil extends TestCase
String name = "r1";
String uri = NS + name;
String shortform = "p:" + name;
+ String longform = "<" + uri + ">";
Resource r = ResourceFactory.createResource(uri);
- assertEquals(uri, PrintUtil.print(r));
+ assertEquals(longform, PrintUtil.print(r));
PrintUtil.registerPrefix("p", NS);
assertEquals(shortform, PrintUtil.print(r));
PrintUtil.removePrefix("p");
- assertEquals(uri, PrintUtil.print(r));
+ assertEquals(longform, PrintUtil.print(r));
Map<String, String> map = new HashMap<>();
map.put("p", NS);
@@ -59,6 +60,6 @@ public class TestPrintUtil extends TestCase
assertEquals(shortform, PrintUtil.print(r));
PrintUtil.removePrefixMap( map );
- assertEquals(uri, PrintUtil.print(r));
+ assertEquals(longform, PrintUtil.print(r));
}
}