From 3ea4a230610fea61ff288dc15e5ce8f4ae36924e Mon Sep 17 00:00:00 2001 From: Olaf Hartig Date: Sun, 30 Sep 2018 20:53:08 +0200 Subject: [PATCH 1/3] changed the access modifier of both 'output' and 'csvSafe' to be protected --- .../main/java/org/apache/jena/sparql/resultset/CSVOutput.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/resultset/CSVOutput.java b/jena-arq/src/main/java/org/apache/jena/sparql/resultset/CSVOutput.java index 28d22c99843..f8ec43f4cc9 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/resultset/CSVOutput.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/resultset/CSVOutput.java @@ -102,7 +102,7 @@ public void format(OutputStream out, ResultSet resultSet) } } - private void output(Writer w, Node n, NodeToLabelMap bnodes) throws IOException + protected void output(Writer w, Node n, NodeToLabelMap bnodes) throws IOException { //String str = FmtUtils.stringForNode(n) ; String str = "?" ; @@ -115,7 +115,7 @@ else if ( n.isBlank() ) w.write(str) ; } - private String csvSafe(String str) + protected String csvSafe(String str) { // Apparently, there are CSV parsers that only accept "" as an escaped quote if inside a "..." if (str.contains("\"") From a8550192ed39c899687764fd9beda410a2560542 Mon Sep 17 00:00:00 2001 From: Olaf Hartig Date: Sun, 30 Sep 2018 20:59:09 +0200 Subject: [PATCH 2/3] added method createNodeFormatter() which can be overridden in subclasses --- .../java/org/apache/jena/sparql/resultset/TSVOutput.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/resultset/TSVOutput.java b/jena-arq/src/main/java/org/apache/jena/sparql/resultset/TSVOutput.java index 7987a69c421..a046fc000bd 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/resultset/TSVOutput.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/resultset/TSVOutput.java @@ -28,6 +28,7 @@ import org.apache.jena.atlas.lib.StrUtils ; import org.apache.jena.graph.Node ; import org.apache.jena.query.ResultSet ; +import org.apache.jena.riot.out.NodeFormatter ; import org.apache.jena.riot.out.NodeFormatterTTL ; import org.apache.jena.sparql.ARQException ; import org.apache.jena.sparql.core.Var ; @@ -50,7 +51,7 @@ public class TSVOutput extends OutputBase @Override public void format(OutputStream out, ResultSet resultSet) { // Use a Turtle formatter to format terms - NodeFormatterTTL formatter = new NodeFormatterTTL(null, null); + NodeFormatter formatter = createNodeFormatter(); AWriter w = IO.wrapUTF8(out); @@ -92,6 +93,11 @@ public void format(OutputStream out, ResultSet resultSet) { w.flush(); } + protected NodeFormatter createNodeFormatter() { + // Use a Turtle formatter to format terms + return new NodeFormatterTTL(null, null); + } + static final byte[] headerBytes = StrUtils.asUTF8bytes("?_askResult" + NL); static final byte[] yesBytes = StrUtils.asUTF8bytes("true"); static final byte[] noBytes = StrUtils.asUTF8bytes("false"); From ea7b430b825636595e92aebe7366d27b8ddcf47c Mon Sep 17 00:00:00 2001 From: Olaf Hartig Date: Sun, 30 Sep 2018 21:00:09 +0200 Subject: [PATCH 3/3] removed irrelevant comment --- .../main/java/org/apache/jena/sparql/resultset/TSVOutput.java | 1 - 1 file changed, 1 deletion(-) diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/resultset/TSVOutput.java b/jena-arq/src/main/java/org/apache/jena/sparql/resultset/TSVOutput.java index a046fc000bd..886e814aff7 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/resultset/TSVOutput.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/resultset/TSVOutput.java @@ -50,7 +50,6 @@ public class TSVOutput extends OutputBase @Override public void format(OutputStream out, ResultSet resultSet) { - // Use a Turtle formatter to format terms NodeFormatter formatter = createNodeFormatter(); AWriter w = IO.wrapUTF8(out);