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 4f85cf45ef06f703098234aefd57b184deea3268 Author: Andy Seaborne <[email protected]> AuthorDate: Wed Apr 17 19:17:00 2024 +0100 Reformat white space in RIOT writer --- .../apache/jena/riot/out/NodeFormatterBase.java | 49 ++-- .../org/apache/jena/riot/out/NodeFormatterNT.java | 20 +- .../org/apache/jena/riot/out/NodeFormatterTTL.java | 278 ++++++++++----------- .../java/org/apache/jena/riot/out/NodeToLabel.java | 48 ++-- .../org/apache/jena/riot/out/TurtleValidate.java | 84 +++---- .../jena/riot/out/quoted/QuotedStringOutput.java | 8 +- .../riot/out/quoted/QuotedStringOutputBase.java | 18 +- .../jena/riot/out/quoted/QuotedStringOutputNT.java | 8 +- .../riot/out/quoted/QuotedStringOutputTTL.java | 10 +- .../quoted/QuotedStringOutputTTL_MultiLine.java | 22 +- .../org/apache/jena/riot/out/quoted/QuotedURI.java | 16 +- .../apache/jena/riot/writer/DirectiveStyle.java | 8 +- .../org/apache/jena/riot/writer/IndentStyle.java | 8 +- .../org/apache/jena/riot/writer/NQuadsWriter.java | 95 ++++--- .../apache/jena/riot/writer/NTriplesWriter.java | 113 ++++----- .../org/apache/jena/riot/writer/NullWriter.java | 62 ++--- .../org/apache/jena/riot/writer/RDFJSONWriter.java | 193 +++++++------- .../jena/riot/writer/RDFXMLAbbrevWriter.java | 29 ++- .../apache/jena/riot/writer/RDFXMLPlainWriter.java | 24 +- .../apache/jena/riot/writer/StreamWriterTriX.java | 258 +++++++++---------- .../org/apache/jena/riot/writer/TriGWriter.java | 66 ++--- .../apache/jena/riot/writer/TriGWriterBase.java | 18 +- .../apache/jena/riot/writer/TriGWriterBlocks.java | 12 +- .../apache/jena/riot/writer/TriGWriterFlat.java | 12 +- .../apache/jena/riot/writer/TriGWriterLong.java | 10 +- .../org/apache/jena/riot/writer/TurtleWriter.java | 10 +- .../apache/jena/riot/writer/TurtleWriterBase.java | 18 +- .../jena/riot/writer/TurtleWriterBlocks.java | 12 +- .../apache/jena/riot/writer/TurtleWriterFlat.java | 12 +- .../apache/jena/riot/writer/TurtleWriterLong.java | 10 +- .../org/apache/jena/riot/writer/WriterConst.java | 82 +++--- .../jena/riot/writer/WriterDatasetRIOTBase.java | 19 +- .../jena/riot/writer/WriterGraphRIOTBase.java | 21 +- .../org/apache/jena/riot/writer/WriterLib.java | 6 +- .../jena/riot/writer/WriterStreamRDFBase.java | 56 ++--- .../jena/riot/writer/WriterStreamRDFBatched.java | 92 +++---- .../jena/riot/writer/WriterStreamRDFBlocks.java | 168 ++++++------- .../jena/riot/writer/WriterStreamRDFFlat.java | 50 ++-- .../jena/riot/writer/WriterStreamRDFPlain.java | 82 +++--- .../org/apache/jena/riot/writer/WriterTriX.java | 58 ++--- 40 files changed, 1070 insertions(+), 1095 deletions(-) diff --git a/jena-arq/src/main/java/org/apache/jena/riot/out/NodeFormatterBase.java b/jena-arq/src/main/java/org/apache/jena/riot/out/NodeFormatterBase.java index b2c4bd684e..2aa753d7ad 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/out/NodeFormatterBase.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/out/NodeFormatterBase.java @@ -18,13 +18,13 @@ package org.apache.jena.riot.out; -import org.apache.jena.atlas.io.AWriter ; -import org.apache.jena.datatypes.RDFDatatype ; -import org.apache.jena.datatypes.xsd.XSDDatatype ; -import org.apache.jena.graph.Node ; +import org.apache.jena.atlas.io.AWriter; +import org.apache.jena.datatypes.RDFDatatype; +import org.apache.jena.datatypes.xsd.XSDDatatype; +import org.apache.jena.graph.Node; import org.apache.jena.graph.Node_Triple; import org.apache.jena.graph.Triple; -import org.apache.jena.sparql.ARQInternalErrorException ; +import org.apache.jena.sparql.ARQInternalErrorException; /** * Provide implementations of the operations of {@link NodeFormatter} in terms @@ -33,25 +33,23 @@ import org.apache.jena.sparql.ARQInternalErrorException ; public abstract class NodeFormatterBase implements NodeFormatter { @Override - public void format(AWriter w, Node n) - { - // Can't use a fixed visitor because of the writer? + public void format(AWriter w, Node n) { if ( n.isBlank() ) - formatBNode(w, n) ; + formatBNode(w, n); else if ( n.isURI() ) - formatURI(w, n) ; + formatURI(w, n); else if ( n.isLiteral() ) - formatLiteral(w, n) ; + formatLiteral(w, n); else if ( n.isVariable() ) - formatVar(w, n) ; + formatVar(w, n); else if ( Node.ANY.equals(n) ) - w.print("ANY") ; + w.print("ANY"); else if ( n instanceof Node_Triple ) formatNodeTriple(w, n); // else if ( n instanceof Node_Graph ) // formatNodeGraph(w, (Node_Graph)n); else - throw new ARQInternalErrorException("Unknown node type: "+n) ; + throw new ARQInternalErrorException("Unknown node type: "+n); } protected void formatNodeTriple(AWriter w, Node n) { @@ -66,32 +64,31 @@ public abstract class NodeFormatterBase implements NodeFormatter } @Override - public void formatURI(AWriter w, Node n) { formatURI(w, n.getURI()) ; } + public void formatURI(AWriter w, Node n) { formatURI(w, n.getURI()); } @Override - public void formatBNode(AWriter w, Node n) { formatBNode(w, n.getBlankNodeLabel()) ; } + public void formatBNode(AWriter w, Node n) { formatBNode(w, n.getBlankNodeLabel()); } @Override - public void formatLiteral(AWriter w, Node n) - { - RDFDatatype dt = n.getLiteralDatatype() ; - String lang = n.getLiteralLanguage() ; - String lex = n.getLiteralLexicalForm() ; + public void formatLiteral(AWriter w, Node n) { + RDFDatatype dt = n.getLiteralDatatype(); + String lang = n.getLiteralLanguage(); + String lex = n.getLiteralLexicalForm(); if ( lang != null && ! lang.equals("") ) { - formatLitLang(w, lex, lang) ; + formatLitLang(w, lex, lang); } else if ( dt == null ) { // RDF 1.0, simple literal. - formatLitString(w, lex) ; + formatLitString(w, lex); } else if ( dt.equals(XSDDatatype.XSDstring) ) { // RDF 1.1, xsd:string - output as short string. - formatLitString(w, lex) ; + formatLitString(w, lex); } else { // Datatype, no language tag, not short string. - formatLitDT(w, lex, dt.getURI()) ; + formatLitDT(w, lex, dt.getURI()); } } @Override - public void formatVar(AWriter w, Node n) { formatVar(w, n.getName()) ; } + public void formatVar(AWriter w, Node n) { formatVar(w, n.getName()); } } diff --git a/jena-arq/src/main/java/org/apache/jena/riot/out/NodeFormatterNT.java b/jena-arq/src/main/java/org/apache/jena/riot/out/NodeFormatterNT.java index b2e897c2f1..f02610fb2b 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/out/NodeFormatterNT.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/out/NodeFormatterNT.java @@ -18,26 +18,26 @@ package org.apache.jena.riot.out; -import org.apache.jena.atlas.io.AWriter ; -import org.apache.jena.atlas.lib.CharSpace ; -import org.apache.jena.atlas.lib.EscapeStr ; -import org.apache.jena.riot.out.quoted.QuotedStringOutput ; -import org.apache.jena.riot.out.quoted.QuotedStringOutputNT ; -import org.apache.jena.riot.out.quoted.QuotedURI ; +import org.apache.jena.atlas.io.AWriter; +import org.apache.jena.atlas.lib.CharSpace; +import org.apache.jena.atlas.lib.EscapeStr; +import org.apache.jena.riot.out.quoted.QuotedStringOutput; +import org.apache.jena.riot.out.quoted.QuotedStringOutputNT; +import org.apache.jena.riot.out.quoted.QuotedURI; public class NodeFormatterNT extends NodeFormatterBase { // Formatting for NTriples // Turtles extends this class to intercept forms it can do better. - private final QuotedStringOutput quotedStringProc ; - private final QuotedURI quotedUriProc ; + private final QuotedStringOutput quotedStringProc; + private final QuotedURI quotedUriProc; - public NodeFormatterNT() { this(CharSpace.UTF8) ; } + public NodeFormatterNT() { this(CharSpace.UTF8); } public NodeFormatterNT(CharSpace charSpace) { quotedStringProc = new QuotedStringOutputNT(charSpace); - quotedUriProc = new QuotedURI(charSpace) ; + quotedUriProc = new QuotedURI(charSpace); } @Override diff --git a/jena-arq/src/main/java/org/apache/jena/riot/out/NodeFormatterTTL.java b/jena-arq/src/main/java/org/apache/jena/riot/out/NodeFormatterTTL.java index b6e288f2a6..ffdc3381d8 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/out/NodeFormatterTTL.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/out/NodeFormatterTTL.java @@ -16,23 +16,23 @@ * limitations under the License. */ -package org.apache.jena.riot.out ; +package org.apache.jena.riot.out; import static org.apache.jena.riot.system.RiotChars.isDigit; import static org.apache.jena.riot.system.RiotChars.isPNChars; import static org.apache.jena.riot.system.RiotChars.isPNCharsBase; import static org.apache.jena.riot.system.RiotChars.isPNChars_U; -import org.apache.jena.atlas.io.AWriter ; -import org.apache.jena.atlas.lib.CharSpace ; -import org.apache.jena.atlas.lib.Pair ; -import org.apache.jena.datatypes.xsd.XSDDatatype ; -import org.apache.jena.graph.Node ; +import org.apache.jena.atlas.io.AWriter; +import org.apache.jena.atlas.lib.CharSpace; +import org.apache.jena.atlas.lib.Pair; +import org.apache.jena.datatypes.xsd.XSDDatatype; +import org.apache.jena.graph.Node; import org.apache.jena.irix.IRIException; import org.apache.jena.irix.IRIs; import org.apache.jena.irix.IRIx; -import org.apache.jena.riot.system.PrefixMap ; -import org.apache.jena.riot.system.PrefixMapFactory ; +import org.apache.jena.riot.system.PrefixMap; +import org.apache.jena.riot.system.PrefixMapFactory; /** Node formatter for Turtle using single line strings */ public class NodeFormatterTTL extends NodeFormatterNT @@ -44,20 +44,20 @@ public class NodeFormatterTTL extends NodeFormatterNT // Turtle: abbreviations for literals but no use of prefixes or base. public NodeFormatterTTL() { - this(null, null, NodeToLabel.createBNodeByLabelEncoded()) ; + this(null, null, NodeToLabel.createBNodeByLabelEncoded()); } public NodeFormatterTTL(String baseIRI, PrefixMap prefixMap) { - this(baseIRI, prefixMap, NodeToLabel.createBNodeByLabelEncoded()) ; + this(baseIRI, prefixMap, NodeToLabel.createBNodeByLabelEncoded()); } public NodeFormatterTTL(String baseIRI, PrefixMap prefixMap, NodeToLabel nodeToLabel) { - super(CharSpace.UTF8) ; - this.nodeToLabel = nodeToLabel ; + super(CharSpace.UTF8); + this.nodeToLabel = nodeToLabel; if ( prefixMap == null ) - prefixMap = PrefixMapFactory.create() ; - this.prefixMap = prefixMap ; - this.baseStrIRI = baseIRI ; + prefixMap = PrefixMapFactory.create(); + this.prefixMap = prefixMap; + this.baseStrIRI = baseIRI; if ( baseIRI != null ) { this.baseIRI = IRIs.resolveIRI(baseIRI); if ( ! this.baseIRI.isReference() ) @@ -68,35 +68,35 @@ public class NodeFormatterTTL extends NodeFormatterNT @Override public void formatURI(AWriter w, String uriStr) { - Pair<String, String> pName = prefixMap.abbrev(uriStr) ; + Pair<String, String> pName = prefixMap.abbrev(uriStr); // Check if legal if ( pName != null ) { // Check legal - need to check its legal, not for illegal. // The splitter in "abbrev" only has a weak rule. - String prefix = pName.getLeft() ; - String localname = pName.getRight() ; + String prefix = pName.getLeft(); + String localname = pName.getRight(); if ( safePrefixName(prefix, localname) ) { - w.print(prefix) ; - w.print(':') ; - w.print(localname) ; - return ; + w.print(prefix); + w.print(':'); + w.print(localname); + return; } } // Attempt base abbreviation. if ( baseIRI != null ) { - String x = abbrevByBase(uriStr) ; + String x = abbrevByBase(uriStr); if ( x != null ) { - w.print('<') ; - w.print(x) ; - w.print('>') ; - return ; + w.print('<'); + w.print(x); + w.print('>'); + return; } } // else - super.formatURI(w, uriStr) ; + super.formatURI(w, uriStr); } private String abbrevByBase(String uriStr) { @@ -109,8 +109,8 @@ public class NodeFormatterTTL extends NodeFormatterNT @Override public void formatBNode(AWriter w, Node n) { - String x = nodeToLabel.get(null, n) ; - w.print(x) ; + String x = nodeToLabel.get(null, n); + w.print(x); } // From NodeFormatterNT: @@ -125,7 +125,7 @@ public class NodeFormatterTTL extends NodeFormatterNT // public void formatLitLang(WriterI w, String lex, String langTag) static boolean safePrefixName(String prefix, String localname) { - return safeForPrefix(prefix) && safeForPrefixLocalname(localname) ; + return safeForPrefix(prefix) && safeForPrefixLocalname(localname); } // [139s] PNAME_NS ::= PN_PREFIX? ':' @@ -146,112 +146,112 @@ public class NodeFormatterTTL extends NodeFormatterNT /* private-testing */ static boolean safeForPrefix(String str) { // PN_PREFIX ::= PN_CHARS_BASE ((PN_CHARS | '.')* PN_CHARS)? - int N = str.length() ; + int N = str.length(); if ( N == 0 ) - return true ; - int idx = 0 ; - idx = skip1_PN_CHARS_BASE(str, idx) ; + return true; + int idx = 0; + idx = skip1_PN_CHARS_BASE(str, idx); if ( idx == -1 ) - return false ; - idx = skipAny_PN_CHARS_or_DOT(str, idx, N - 1) ; + return false; + idx = skipAny_PN_CHARS_or_DOT(str, idx, N - 1); if ( idx == -1 ) - return false ; - idx = skip1_PN_CHARS(str, idx) ; + return false; + idx = skip1_PN_CHARS(str, idx); if ( idx == -1 ) - return false ; - return (idx == N) ; + return false; + return (idx == N); } /* private-testing */static boolean safeForPrefixLocalname(String str) { // PN_LOCAL ::= (PN_CHARS_U | ':' | [0-9] | PLX) ((PN_CHARS | '.' | ':' | PLX)* (PN_CHARS | ':' | PLX))? // This code does not consider PLX (which is more than one character). - int N = str.length() ; + int N = str.length(); if ( N == 0 ) - return true ; - int idx = 0 ; - idx = skip1_PN_CHARS_U_or_digit_or_COLON(str, idx) ; + return true; + int idx = 0; + idx = skip1_PN_CHARS_U_or_digit_or_COLON(str, idx); if ( idx == -1 ) - return false ; - idx = skipAny_PN_CHARS_or_DOT_or_COLON(str, idx, N - 1) ; + return false; + idx = skipAny_PN_CHARS_or_DOT_or_COLON(str, idx, N - 1); if ( idx == -1 ) - return false ; + return false; // Final char - idx = skip1_PN_CHARS_or_COLON(str, idx) ; + idx = skip1_PN_CHARS_or_COLON(str, idx); if ( idx == -1 ) - return false ; + return false; // We got to the end. - return (idx == N) ; + return (idx == N); } // ---- Prefix name : prefix part private static int skip1_PN_CHARS_BASE(String str, int idx) { - char ch = str.charAt(idx) ; + char ch = str.charAt(idx); if ( isPNCharsBase(ch) ) - return idx + 1 ; - return -1 ; + return idx + 1; + return -1; } private static int skipAny_PN_CHARS_or_DOT(String str, int idx, int max) { for (int i = idx; i < max; i++) { - char ch = str.charAt(i) ; + char ch = str.charAt(i); if ( !isPNChars(ch) && ch != '.' ) - return i ; + return i; } - return max ; + return max; } private static int skip1_PN_CHARS(String str, int idx) { - char ch = str.charAt(idx) ; + char ch = str.charAt(idx); if ( isPNChars(ch) ) - return idx + 1 ; - return -1 ; + return idx + 1; + return -1; } // ---- Prefix name : local part private static int skip1_PN_CHARS_U_or_digit_or_COLON(String str, int idx) { - char ch = str.charAt(idx) ; + char ch = str.charAt(idx); if ( isPNChars_U(ch) ) - return idx + 1 ; + return idx + 1; if ( isDigit(ch) ) - return idx + 1 ; + return idx + 1; if ( ch == ':' ) - return idx + 1 ; - return -1 ; + return idx + 1; + return -1; } private static int skipAny_PN_CHARS_or_DOT_or_COLON(String str, int idx, int max) { for (int i = idx; i < max; i++) { - char ch = str.charAt(i) ; + char ch = str.charAt(i); if ( !isPNChars(ch) && ch != '.' && ch != ':' ) - return i ; + return i; } - return max ; + return max; } private static int skip1_PN_CHARS_or_COLON(String str, int idx) { - char ch = str.charAt(idx) ; + char ch = str.charAt(idx); if ( isPNChars(ch) ) - return idx + 1 ; + return idx + 1; if ( ch == ':' ) - return idx + 1 ; - return -1 ; + return idx + 1; + return -1; } // ---- - private static final String dtDecimal = XSDDatatype.XSDdecimal.getURI() ; - private static final String dtInteger = XSDDatatype.XSDinteger.getURI() ; - private static final String dtDouble = XSDDatatype.XSDdouble.getURI() ; - private static final String dtBoolean = XSDDatatype.XSDboolean.getURI() ; + private static final String dtDecimal = XSDDatatype.XSDdecimal.getURI(); + private static final String dtInteger = XSDDatatype.XSDinteger.getURI(); + private static final String dtDouble = XSDDatatype.XSDdouble.getURI(); + private static final String dtBoolean = XSDDatatype.XSDboolean.getURI(); @Override public void formatLitDT(AWriter w, String lex, String datatypeURI) { - boolean b = writeLiteralAbbreviated(w, lex, datatypeURI) ; + boolean b = writeLiteralAbbreviated(w, lex, datatypeURI); if ( b ) - return ; - writeLiteralWithDT(w, lex, datatypeURI) ; + return; + writeLiteralWithDT(w, lex, datatypeURI); } protected void writeLiteralWithDT(AWriter w, String lex, String datatypeURI) { @@ -259,7 +259,7 @@ public class NodeFormatterTTL extends NodeFormatterNT } protected void writeLiteralOneLine(AWriter w, String lex, String datatypeURI) { - super.formatLitDT(w, lex, datatypeURI) ; + super.formatLitDT(w, lex, datatypeURI); } /** Write in a short form, e.g. integer. @@ -268,107 +268,107 @@ public class NodeFormatterTTL extends NodeFormatterNT protected boolean writeLiteralAbbreviated(AWriter w, String lex, String datatypeURI) { if ( dtDecimal.equals(datatypeURI) ) { if ( validDecimal(lex) ) { - w.print(lex) ; - return true ; + w.print(lex); + return true; } } else if ( dtInteger.equals(datatypeURI) ) { if ( validInteger(lex) ) { - w.print(lex) ; - return true ; + w.print(lex); + return true; } } else if ( dtDouble.equals(datatypeURI) ) { if ( validDouble(lex) ) { - w.print(lex) ; - return true ; + w.print(lex); + return true; } } else if ( dtBoolean.equals(datatypeURI) ) { // We leave "0" and "1" as-is assuming that if written like that, // there was a reason. if ( lex.equals("true") || lex.equals("false") ) { - w.print(lex) ; - return true ; + w.print(lex); + return true; } } - return false ; + return false; } private static boolean validInteger(String lex) { - int N = lex.length() ; + int N = lex.length(); if ( N == 0 ) - return false ; - int idx = 0 ; + return false; + int idx = 0; - idx = skipSign(lex, idx) ; - idx = skipDigits(lex, idx) ; - return (idx == N) ; + idx = skipSign(lex, idx); + idx = skipDigits(lex, idx); + return (idx == N); } private static boolean validDecimal(String lex) { // case : In N3, "." illegal, as is "+." and -." but legal in Turtle. - int N = lex.length() ; + int N = lex.length(); if ( N <= 1 ) - return false ; - int idx = 0 ; + return false; + int idx = 0; - idx = skipSign(lex, idx) ; - idx = skipDigits(lex, idx) ; // Maybe none. + idx = skipSign(lex, idx); + idx = skipDigits(lex, idx); // Maybe none. // DOT required. if ( idx >= N ) - return false ; + return false; - char ch = lex.charAt(idx) ; + char ch = lex.charAt(idx); if ( ch != '.' ) - return false ; - idx++ ; + return false; + idx++; // Digit required. if ( idx >= N ) - return false ; - idx = skipDigits(lex, idx) ; - return (idx == N) ; + return false; + idx = skipDigits(lex, idx); + return (idx == N); } private static boolean validDouble(String lex) { - int N = lex.length() ; + int N = lex.length(); if ( N == 0 ) - return false ; - int idx = 0 ; + return false; + int idx = 0; // Decimal part (except 12. is legal) - idx = skipSign(lex, idx) ; + idx = skipSign(lex, idx); - int idx2 = skipDigits(lex, idx) ; - boolean initialDigits = (idx != idx2) ; - idx = idx2 ; + int idx2 = skipDigits(lex, idx); + boolean initialDigits = (idx != idx2); + idx = idx2; // Exponent required. if ( idx >= N ) - return false ; - char ch = lex.charAt(idx) ; + return false; + char ch = lex.charAt(idx); if ( ch == '.' ) { - idx++ ; + idx++; if ( idx >= N ) - return false ; - idx2 = skipDigits(lex, idx) ; - boolean trailingDigits = (idx != idx2) ; - idx = idx2 ; + return false; + idx2 = skipDigits(lex, idx); + boolean trailingDigits = (idx != idx2); + idx = idx2; if ( idx >= N ) - return false ; + return false; if ( !initialDigits && !trailingDigits ) - return false ; + return false; } // "e" or "E" - ch = lex.charAt(idx) ; + ch = lex.charAt(idx); if ( ch != 'e' && ch != 'E' ) - return false ; - idx++ ; + return false; + idx++; if ( idx >= N ) - return false ; - idx = skipSign(lex, idx) ; + return false; + idx = skipSign(lex, idx); if ( idx >= N ) - return false ; // At least one digit. - idx = skipDigits(lex, idx) ; - return (idx == N) ; + return false; // At least one digit. + idx = skipDigits(lex, idx); + return (idx == N); } /** @@ -376,21 +376,21 @@ public class NodeFormatterTTL extends NodeFormatterNT * be beyond the length of the string. May skip zero. */ private static int skipDigits(String str, int start) { - int N = str.length() ; + int N = str.length(); for (int i = start; i < N; i++) { - char ch = str.charAt(i) ; + char ch = str.charAt(i); if ( ! isDigit(ch) ) - return i ; + return i; } - return N ; + return N; } /** Skip any plus or minus */ private static int skipSign(String str, int idx) { - int N = str.length() ; - char ch = str.charAt(idx) ; + int N = str.length(); + char ch = str.charAt(idx); if ( ch == '+' || ch == '-' ) - return idx + 1 ; - return idx ; + return idx + 1; + return idx; } } diff --git a/jena-arq/src/main/java/org/apache/jena/riot/out/NodeToLabel.java b/jena-arq/src/main/java/org/apache/jena/riot/out/NodeToLabel.java index 1c1033682e..b5cfae8a91 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/out/NodeToLabel.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/out/NodeToLabel.java @@ -18,13 +18,13 @@ package org.apache.jena.riot.out; -import java.util.HashMap ; -import java.util.Map ; +import java.util.HashMap; +import java.util.Map; -import org.apache.jena.atlas.lib.InternalErrorException ; -import org.apache.jena.graph.Node ; -import org.apache.jena.riot.system.MapWithScope ; -import org.apache.jena.riot.system.SyntaxLabels ; +import org.apache.jena.atlas.lib.InternalErrorException; +import org.apache.jena.graph.Node; +import org.apache.jena.riot.system.MapWithScope; +import org.apache.jena.riot.system.SyntaxLabels; /** Map nodes to string (usually, blank nodes to labels). * See {@link SyntaxLabels#createNodeToLabel} for getting a default setup. @@ -34,39 +34,39 @@ public class NodeToLabel extends MapWithScope<Node, String, Node> { /** Allocation from a single scope; just the label matters. */ static public NodeToLabel createScopeByDocument() - { return new NodeToLabel(new SingleScopePolicy(), new AllocatorIncLabel()) ; } + { return new NodeToLabel(new SingleScopePolicy(), new AllocatorIncLabel()); } // /** Allocation scoped by graph and label. */ // public static NodeToLabel createScopeByGraph() -// { return new NodeToLabel(new GraphScopePolicy(), new AllocatorIncLabel()) ; } +// { return new NodeToLabel(new GraphScopePolicy(), new AllocatorIncLabel()); } /** Allocation as per internal label, with an encoded safe label. */ public static NodeToLabel createBNodeByLabelEncoded() - { return new NodeToLabel(new SingleScopePolicy(), new AllocatorInternalSafe()) ; } + { return new NodeToLabel(new SingleScopePolicy(), new AllocatorInternalSafe()); } /** Allocation as per internal label */ public static NodeToLabel createBNodeByLabelAsGiven() - { return new NodeToLabel(new SingleScopePolicy(), new AllocatorInternalRaw()) ; } + { return new NodeToLabel(new SingleScopePolicy(), new AllocatorInternalRaw()); } /** Allocation as per internal label */ public static NodeToLabel createBNodeByIRI() - { return new NodeToLabel(new SingleScopePolicy(), new AllocatorBNodeAsIRI()) ; } + { return new NodeToLabel(new SingleScopePolicy(), new AllocatorBNodeAsIRI()); } - private static final NodeToLabel _internal = createBNodeByLabelEncoded() ; - public static NodeToLabel labelByInternal() { return _internal ; } + private static final NodeToLabel _internal = createBNodeByLabelEncoded(); + public static NodeToLabel labelByInternal() { return _internal; } private NodeToLabel(ScopePolicy<Node, String, Node> scopePolicy, Allocator<Node, String, Node> allocator) { - super(scopePolicy, allocator) ; + super(scopePolicy, allocator); } // ======== Scope Policies /** Single scope */ private static class SingleScopePolicy implements ScopePolicy<Node, String, Node> { - private Map<Node, String> map = new HashMap<>() ; + private Map<Node, String> map = new HashMap<>(); @Override - public Map<Node, String> getScope(Node scope) { return map ; } + public Map<Node, String> getScope(Node scope) { return map; } @Override public void clear() { map.clear(); } } @@ -74,21 +74,21 @@ public class NodeToLabel extends MapWithScope<Node, String, Node> /** One scope for labels per graph */ private static class GraphScopePolicy implements ScopePolicy<Node, String, Node> { - private Map<Node, String> dftMap = new HashMap<>() ; - private Map<Node, Map<Node, String>> map = new HashMap<>() ; + private Map<Node, String> dftMap = new HashMap<>(); + private Map<Node, Map<Node, String>> map = new HashMap<>(); @Override public Map<Node, String> getScope(Node scope) { if ( scope == null ) - return dftMap ; + return dftMap; - Map<Node, String> x = map.get(scope) ; + Map<Node, String> x = map.get(scope); if ( x == null ) { - x = new HashMap<>() ; - map.put(scope, x) ; + x = new HashMap<>(); + map.put(scope, x); } - return x ; + return x; } @Override public void clear() { map.clear(); } @@ -172,7 +172,7 @@ public class NodeToLabel extends MapWithScope<Node, String, Node> @Override protected String labelForBlank(Node node) { // Needs to be safe? - // String str = NodeFmtLib.safeBNodeLabel(node.getBlankNodeLabel()) ; + // String str = NodeFmtLib.safeBNodeLabel(node.getBlankNodeLabel()); String str = node.getBlankNodeLabel(); return "<_:" + str + ">"; } diff --git a/jena-arq/src/main/java/org/apache/jena/riot/out/TurtleValidate.java b/jena-arq/src/main/java/org/apache/jena/riot/out/TurtleValidate.java index ff55f33cda..7d0ecb6c07 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/out/TurtleValidate.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/out/TurtleValidate.java @@ -18,10 +18,10 @@ package org.apache.jena.riot.out; -import java.text.CharacterIterator ; -import java.text.StringCharacterIterator ; +import java.text.CharacterIterator; +import java.text.StringCharacterIterator; -import org.apache.jena.riot.RiotException ; +import org.apache.jena.riot.RiotException; /** Validation of Turtle terms */ @@ -32,7 +32,7 @@ public class TurtleValidate // These tests must agree, or be more restrictive, than the parser. protected static boolean checkValidPrefixedName(String ns, String local) { - return checkValidPrefixPart(ns) && checkValidNamePart(local) ; + return checkValidPrefixPart(ns) && checkValidNamePart(local); } /* http://www.w3.org/TeamSubmission/turtle/#sec-grammar-grammar @@ -47,69 +47,69 @@ public class TurtleValidate { if ( s.length() == 0 ) return true; - CharacterIterator cIter = new StringCharacterIterator(s) ; - char ch = cIter.first() ; + CharacterIterator cIter = new StringCharacterIterator(s); + char ch = cIter.first(); if ( ! checkNameStartChar(ch) ) - return false ; + return false; if ( ch == '_' ) // Can't start with _ (bnodes labels handled separately) - return false ; - return checkNameTail(cIter) ; + return false; + return checkNameTail(cIter); } private static boolean checkValidPrefixName(String prefixedName) { // Split it to get the parts. - int i = prefixedName.indexOf(':') ; + int i = prefixedName.indexOf(':'); if ( i < 0 ) - throw new RiotException("Broken short form -- "+prefixedName) ; - String p = prefixedName.substring(0,i) ; - String x = prefixedName.substring(i+1) ; + throw new RiotException("Broken short form -- "+prefixedName); + String p = prefixedName.substring(0,i); + String x = prefixedName.substring(i+1); // Check legality if ( checkValidPrefixedName(p, x) ) - return true ; - return false ; + return true; + return false; } protected static boolean checkValidNamePart(String s) { if ( s.length() == 0 ) return true; - CharacterIterator cIter = new StringCharacterIterator(s) ; - char ch = cIter.first() ; + CharacterIterator cIter = new StringCharacterIterator(s); + char ch = cIter.first(); if ( ! checkNameStartChar(ch) ) - return false ; - return checkNameTail(cIter) ; + return false; + return checkNameTail(cIter); } // private static boolean checkValidLocalname(String localname) // { // if ( localname.length() == 0 ) -// return true ; +// return true; // -// for ( int idx = 0 ; idx < localname.length() ; idx++ ) +// for ( int idx = 0; idx < localname.length(); idx++ ) // { -// char ch = localname.charAt(idx) ; +// char ch = localname.charAt(idx); // if ( ! validPNameChar(ch) ) -// return false ; +// return false; // } // // // Test start and end - at least one character in the name. // // if ( localname.endsWith(".") ) -// return false ; +// return false; // if ( localname.startsWith(".") ) -// return false ; +// return false; // -// return true ; +// return true; // } // // private static boolean validPNameChar(char ch) // { -// if ( Character.isLetterOrDigit(ch) ) return true ; -// if ( ch == '.' ) return true ; -// if ( ch == '-' ) return true ; -// if ( ch == '_' ) return true ; -// return false ; +// if ( Character.isLetterOrDigit(ch) ) return true; +// if ( ch == '.' ) return true; +// if ( ch == '-' ) return true; +// if ( ch == '_' ) return true; +// return false; // } @@ -117,34 +117,34 @@ public class TurtleValidate { // Assumes cIter.first already called but nothing else. // Skip first char. - char ch = cIter.next() ; - for ( ; ch != java.text.CharacterIterator.DONE ; ch = cIter.next() ) + char ch = cIter.next(); + for (; ch != java.text.CharacterIterator.DONE; ch = cIter.next() ) { if ( ! checkNameChar(ch) ) - return false ; + return false; } - return true ; + return true; } protected static boolean checkNameStartChar(char ch) { if ( Character.isLetter(ch) ) - return true ; + return true; if ( ch == '_' ) - return true ; - return false ; + return true; + return false; } // Dotted parts for SPARQL? protected static boolean checkNameChar(char ch) { if ( Character.isLetterOrDigit(ch) ) - return true ; + return true; if ( ch == '_' ) - return true ; + return true; if ( ch == '-' ) - return true ; - return false ; + return true; + return false; } diff --git a/jena-arq/src/main/java/org/apache/jena/riot/out/quoted/QuotedStringOutput.java b/jena-arq/src/main/java/org/apache/jena/riot/out/quoted/QuotedStringOutput.java index 35d2968e6a..e0f89a40e2 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/out/quoted/QuotedStringOutput.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/out/quoted/QuotedStringOutput.java @@ -18,15 +18,15 @@ package org.apache.jena.riot.out.quoted; -import org.apache.jena.atlas.io.AWriter ; +import org.apache.jena.atlas.io.AWriter; /** Interface for writing quoted strings for Turtle, TriG, N-triples and N-Quads */ public interface QuotedStringOutput { - public char getQuoteChar() ; + public char getQuoteChar(); /** Write a string on one line */ - public void writeStr(AWriter writer, String s) ; + public void writeStr(AWriter writer, String s); /** Write a string, possible on several lines */ - public void writeStrMultiLine(AWriter writer, String s) ; + public void writeStrMultiLine(AWriter writer, String s); } diff --git a/jena-arq/src/main/java/org/apache/jena/riot/out/quoted/QuotedStringOutputBase.java b/jena-arq/src/main/java/org/apache/jena/riot/out/quoted/QuotedStringOutputBase.java index 7ea7eb0ce2..18f94e5c08 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/out/quoted/QuotedStringOutputBase.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/out/quoted/QuotedStringOutputBase.java @@ -18,35 +18,35 @@ package org.apache.jena.riot.out.quoted; -import org.apache.jena.atlas.io.AWriter ; -import org.apache.jena.atlas.lib.CharSpace ; -import org.apache.jena.atlas.lib.EscapeStr ; +import org.apache.jena.atlas.io.AWriter; +import org.apache.jena.atlas.lib.CharSpace; +import org.apache.jena.atlas.lib.EscapeStr; /** Quoted string output - single line, settable quote character and char space. */ public class QuotedStringOutputBase implements QuotedStringOutput { - protected final CharSpace charSpace ; + protected final CharSpace charSpace; protected final char quoteChar; protected QuotedStringOutputBase(char quoteChar, CharSpace charSpace) { - this.charSpace = charSpace ; - this.quoteChar = quoteChar ; + this.charSpace = charSpace; + this.quoteChar = quoteChar; } @Override - public char getQuoteChar() { return quoteChar ; } + public char getQuoteChar() { return quoteChar; } @Override public void writeStr(AWriter writer, String str) { // Only " strings in N-Triples/N-Quads writer.print(getQuoteChar()); - EscapeStr.stringEsc(writer, str, getQuoteChar(), true, charSpace) ; + EscapeStr.stringEsc(writer, str, getQuoteChar(), true, charSpace); writer.print(getQuoteChar()); } @Override public void writeStrMultiLine(AWriter writer, String str) { // No multiline strings in N-Triples/N-Quads. - writeStr(writer, str) ; + writeStr(writer, str); } } diff --git a/jena-arq/src/main/java/org/apache/jena/riot/out/quoted/QuotedStringOutputNT.java b/jena-arq/src/main/java/org/apache/jena/riot/out/quoted/QuotedStringOutputNT.java index ec3c9f5a8f..1c7927a526 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/out/quoted/QuotedStringOutputNT.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/out/quoted/QuotedStringOutputNT.java @@ -18,17 +18,17 @@ package org.apache.jena.riot.out.quoted; -import org.apache.jena.atlas.lib.CharSpace ; -import org.apache.jena.atlas.lib.Chars ; +import org.apache.jena.atlas.lib.CharSpace; +import org.apache.jena.atlas.lib.Chars; /** Escape processor for N-Triples/N-Quads */ public class QuotedStringOutputNT extends QuotedStringOutputBase { public QuotedStringOutputNT() { - this(CharSpace.UTF8) ; + this(CharSpace.UTF8); } public QuotedStringOutputNT(CharSpace charSpace) { - super(Chars.CH_QUOTE2, charSpace) ; + super(Chars.CH_QUOTE2, charSpace); } } diff --git a/jena-arq/src/main/java/org/apache/jena/riot/out/quoted/QuotedStringOutputTTL.java b/jena-arq/src/main/java/org/apache/jena/riot/out/quoted/QuotedStringOutputTTL.java index 0ac12572dd..a687caab7c 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/out/quoted/QuotedStringOutputTTL.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/out/quoted/QuotedStringOutputTTL.java @@ -18,24 +18,24 @@ package org.apache.jena.riot.out.quoted; -import org.apache.jena.atlas.lib.CharSpace ; -import org.apache.jena.atlas.lib.Chars ; +import org.apache.jena.atlas.lib.CharSpace; +import org.apache.jena.atlas.lib.Chars; /** Escape processor for Turtle. */ public class QuotedStringOutputTTL extends QuotedStringOutputBase { public QuotedStringOutputTTL() { - this(Chars.CH_QUOTE2, CharSpace.UTF8) ; + this(Chars.CH_QUOTE2, CharSpace.UTF8); } /** Always use the given quote character (0 means use " or ' as needed) */ public QuotedStringOutputTTL(char quoteChar) { - this(quoteChar, CharSpace.UTF8) ; + this(quoteChar, CharSpace.UTF8); } /** Turtle is UTF-8 : ASCII is for non-standard needs */ protected QuotedStringOutputTTL(char quoteChar, CharSpace charSpace) { - super(quoteChar, charSpace) ; + super(quoteChar, charSpace); } } diff --git a/jena-arq/src/main/java/org/apache/jena/riot/out/quoted/QuotedStringOutputTTL_MultiLine.java b/jena-arq/src/main/java/org/apache/jena/riot/out/quoted/QuotedStringOutputTTL_MultiLine.java index 1f8d8696ef..f4f52f3aa6 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/out/quoted/QuotedStringOutputTTL_MultiLine.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/out/quoted/QuotedStringOutputTTL_MultiLine.java @@ -18,38 +18,38 @@ package org.apache.jena.riot.out.quoted; -import org.apache.jena.atlas.io.AWriter ; -import org.apache.jena.atlas.lib.CharSpace ; -import org.apache.jena.atlas.lib.EscapeStr ; +import org.apache.jena.atlas.io.AWriter; +import org.apache.jena.atlas.lib.CharSpace; +import org.apache.jena.atlas.lib.EscapeStr; public class QuotedStringOutputTTL_MultiLine extends QuotedStringOutputTTL { public QuotedStringOutputTTL_MultiLine() { - super() ; + super(); } /** Always use the given quote character */ public QuotedStringOutputTTL_MultiLine(char quoteChar) { - super(quoteChar) ; + super(quoteChar); } /** Turtle is UTF-8 : ASCII is for non-standard needs */ protected QuotedStringOutputTTL_MultiLine(char quoteChar, CharSpace charSpace) { - super(quoteChar, charSpace) ; + super(quoteChar, charSpace); } /** Write a string using triple quotes. Try to avoid escapes by looking for the quote character first. */ @Override public void writeStrMultiLine(AWriter w, String s) { - quote3(w) ; + quote3(w); EscapeStr.stringEsc(w, s, quoteChar, false, charSpace); - quote3(w) ; + quote3(w); } private void quote3(AWriter w) { - w.print(quoteChar) ; - w.print(quoteChar) ; - w.print(quoteChar) ; + w.print(quoteChar); + w.print(quoteChar); + w.print(quoteChar); } } diff --git a/jena-arq/src/main/java/org/apache/jena/riot/out/quoted/QuotedURI.java b/jena-arq/src/main/java/org/apache/jena/riot/out/quoted/QuotedURI.java index 5f1d417b42..6d1edad138 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/out/quoted/QuotedURI.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/out/quoted/QuotedURI.java @@ -18,12 +18,12 @@ package org.apache.jena.riot.out.quoted; -import org.apache.jena.atlas.io.AWriter ; +import org.apache.jena.atlas.io.AWriter; import org.apache.jena.atlas.io.IndentedLineBuffer; import org.apache.jena.atlas.io.OutputUtils; -import org.apache.jena.atlas.lib.CharSpace ; -import org.apache.jena.atlas.lib.Chars ; -import org.apache.jena.atlas.lib.EscapeStr ; +import org.apache.jena.atlas.lib.CharSpace; +import org.apache.jena.atlas.lib.Chars; +import org.apache.jena.atlas.lib.EscapeStr; import org.apache.jena.atlas.logging.FmtLog; import org.apache.jena.riot.RiotException; import org.apache.jena.riot.SysRIOT; @@ -42,10 +42,10 @@ import org.apache.jena.riot.SysRIOT; */ public class QuotedURI { - private final CharSpace charSpace ; + private final CharSpace charSpace; public QuotedURI() { - this(CharSpace.UTF8) ; + this(CharSpace.UTF8); } /** Write a replacement for a bad character. */ @@ -57,7 +57,7 @@ public class QuotedURI { private interface BadCharHandler { void badChar(int idx, String str, char ch); } public QuotedURI(CharSpace charSpace) { - this.charSpace = charSpace ; + this.charSpace = charSpace; } /** Write a string for a URI on one line. */ @@ -321,7 +321,7 @@ public class QuotedURI { * Control chars mentioned in the specs. */ private static boolean isControlChar(char c) { - return c < 20 ; + return c < 20; // Unicode has a another control char block at 007F to 09FF // In the range [U+0000, U+001F], or range [U+007F, U+009F] //return Character.isISOControl(c); diff --git a/jena-arq/src/main/java/org/apache/jena/riot/writer/DirectiveStyle.java b/jena-arq/src/main/java/org/apache/jena/riot/writer/DirectiveStyle.java index 96099c4439..7570696683 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/writer/DirectiveStyle.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/writer/DirectiveStyle.java @@ -19,15 +19,15 @@ package org.apache.jena.riot.writer; public enum DirectiveStyle { - AT, KEYWORD ; + AT, KEYWORD; public static DirectiveStyle systemDefault = DirectiveStyle.KEYWORD; public static DirectiveStyle create(String label) { - String s = label.toLowerCase() ; + String s = label.toLowerCase(); return switch(s) { - case "rdf_10", "rdf10", "at" -> DirectiveStyle.AT ; - case "rdf_11", "rdf11", "sparql" -> DirectiveStyle.KEYWORD ; + case "rdf_10", "rdf10", "at" -> DirectiveStyle.AT; + case "rdf_11", "rdf11", "sparql" -> DirectiveStyle.KEYWORD; default -> systemDefault; }; } diff --git a/jena-arq/src/main/java/org/apache/jena/riot/writer/IndentStyle.java b/jena-arq/src/main/java/org/apache/jena/riot/writer/IndentStyle.java index 1abe34c67a..37bfbc1a1a 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/writer/IndentStyle.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/writer/IndentStyle.java @@ -25,14 +25,14 @@ package org.apache.jena.riot.writer; */ enum IndentStyle { - WIDE, LONG ; + WIDE, LONG; public static IndentStyle create(String label) { - String s = label.toLowerCase() ; + String s = label.toLowerCase(); switch(s) { case "wide": - return IndentStyle.WIDE ; + return IndentStyle.WIDE; case "long": - return IndentStyle.LONG ; + return IndentStyle.LONG; } return null; } diff --git a/jena-arq/src/main/java/org/apache/jena/riot/writer/NQuadsWriter.java b/jena-arq/src/main/java/org/apache/jena/riot/writer/NQuadsWriter.java index 52c0ea04f7..b6d1434c0c 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/writer/NQuadsWriter.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/writer/NQuadsWriter.java @@ -18,76 +18,67 @@ package org.apache.jena.riot.writer; -import java.io.OutputStream ; -import java.io.Writer ; -import java.util.Iterator ; +import java.io.OutputStream; +import java.io.Writer; +import java.util.Iterator; -import org.apache.jena.atlas.lib.CharSpace ; -import org.apache.jena.riot.Lang ; -import org.apache.jena.riot.system.PrefixMap ; -import org.apache.jena.riot.system.StreamRDFOps ; -import org.apache.jena.riot.system.StreamRDF ; -import org.apache.jena.riot.system.StreamRDFLib ; -import org.apache.jena.sparql.core.DatasetGraph ; -import org.apache.jena.sparql.core.Quad ; -import org.apache.jena.sparql.util.Context ; +import org.apache.jena.atlas.lib.CharSpace; +import org.apache.jena.riot.Lang; +import org.apache.jena.riot.system.PrefixMap; +import org.apache.jena.riot.system.StreamRDFOps; +import org.apache.jena.riot.system.StreamRDF; +import org.apache.jena.riot.system.StreamRDFLib; +import org.apache.jena.sparql.core.DatasetGraph; +import org.apache.jena.sparql.core.Quad; +import org.apache.jena.sparql.util.Context; -public class NQuadsWriter extends WriterDatasetRIOTBase -{ - public static void write(OutputStream out, Iterator<Quad> iter) - { +public class NQuadsWriter extends WriterDatasetRIOTBase { + public static void write(OutputStream out, Iterator<Quad> iter) { write(out, iter, CharSpace.UTF8); } - - public static void write(OutputStream out, Iterator<Quad> iter, CharSpace charSpace) - { - StreamRDF s = StreamRDFLib.writer(out, charSpace) ; - write$(s, iter) ; + + public static void write(OutputStream out, Iterator<Quad> iter, CharSpace charSpace) { + StreamRDF s = StreamRDFLib.writer(out, charSpace); + write$(s, iter); } - - public static void write(Writer out, Iterator<Quad> iter) - { + + public static void write(Writer out, Iterator<Quad> iter) { write(out, iter, CharSpace.UTF8); } - - public static void write(Writer out, Iterator<Quad> iter, CharSpace charSpace) - { - StreamRDF s = StreamRDFLib.writer(out, charSpace) ; - write$(s, iter) ; + + public static void write(Writer out, Iterator<Quad> iter, CharSpace charSpace) { + StreamRDF s = StreamRDFLib.writer(out, charSpace); + write$(s, iter); } - private static void write$(StreamRDF s, Iterator<Quad> iter) - { - s.start() ; - StreamRDFOps.sendQuadsToStream(iter, s) ; + private static void write$(StreamRDF s, Iterator<Quad> iter) { + s.start(); + StreamRDFOps.sendQuadsToStream(iter, s); s.finish(); } - - private final CharSpace charSpace ; - - public NQuadsWriter() - { this(CharSpace.UTF8); } - - public NQuadsWriter(CharSpace charSpace) - { - this.charSpace = charSpace ; + + private final CharSpace charSpace; + + public NQuadsWriter() { + this(CharSpace.UTF8); + } + + public NQuadsWriter(CharSpace charSpace) { + this.charSpace = charSpace; } - + @Override - public Lang getLang() - { - return Lang.NQUADS ; + public Lang getLang() { + return Lang.NQUADS; } @Override - public void write(Writer out, DatasetGraph dataset, PrefixMap prefixMap, String baseURI, Context context) - { - write(out, dataset.find(null, null, null, null), this.charSpace) ; + public void write(Writer out, DatasetGraph dataset, PrefixMap prefixMap, String baseURI, Context context) { + write(out, dataset.find(null, null, null, null), this.charSpace); } @Override - public void write(OutputStream out, DatasetGraph dataset, PrefixMap prefixMap, String baseURI, Context context) - { - write(out, dataset.find(null, null, null, null), this.charSpace) ; + public void write(OutputStream out, DatasetGraph dataset, PrefixMap prefixMap, String baseURI, Context context) { + write(out, dataset.find(null, null, null, null), this.charSpace); } } diff --git a/jena-arq/src/main/java/org/apache/jena/riot/writer/NTriplesWriter.java b/jena-arq/src/main/java/org/apache/jena/riot/writer/NTriplesWriter.java index ec6d31f441..f56531c248 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/writer/NTriplesWriter.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/writer/NTriplesWriter.java @@ -18,93 +18,82 @@ package org.apache.jena.riot.writer; -import java.io.OutputStream ; -import java.io.Writer ; -import java.util.Iterator ; +import java.io.OutputStream; +import java.io.Writer; +import java.util.Iterator; -import org.apache.jena.atlas.io.IO ; -import org.apache.jena.atlas.lib.CharSpace ; -import static org.apache.jena.atlas.lib.CharSpace.* ; -import org.apache.jena.graph.Graph ; -import org.apache.jena.graph.Triple ; -import org.apache.jena.riot.Lang ; -import org.apache.jena.riot.system.PrefixMap ; -import org.apache.jena.riot.system.StreamRDFOps ; -import org.apache.jena.riot.system.StreamRDF ; -import org.apache.jena.riot.system.StreamRDFLib ; -import org.apache.jena.sparql.util.Context ; +import org.apache.jena.atlas.io.IO; +import org.apache.jena.atlas.lib.CharSpace; +import static org.apache.jena.atlas.lib.CharSpace.*; +import org.apache.jena.graph.Graph; +import org.apache.jena.graph.Triple; +import org.apache.jena.riot.Lang; +import org.apache.jena.riot.system.PrefixMap; +import org.apache.jena.riot.system.StreamRDFOps; +import org.apache.jena.riot.system.StreamRDF; +import org.apache.jena.riot.system.StreamRDFLib; +import org.apache.jena.sparql.util.Context; -public class NTriplesWriter extends WriterGraphRIOTBase -{ - public static void write(OutputStream out, Iterator<Triple> iter) - { +public class NTriplesWriter extends WriterGraphRIOTBase { + public static void write(OutputStream out, Iterator<Triple> iter) { write(out, iter, CharSpace.UTF8); } - - public static void write(OutputStream out, Iterator<Triple> iter, CharSpace charSpace) - { - StreamRDF s = StreamRDFLib.writer(out, charSpace) ; - write$(s, iter) ; + + public static void write(OutputStream out, Iterator<Triple> iter, CharSpace charSpace) { + StreamRDF s = StreamRDFLib.writer(out, charSpace); + write$(s, iter); } - - public static void write(Writer out, Iterator<Triple> iter) - { + + public static void write(Writer out, Iterator<Triple> iter) { write(out, iter, CharSpace.UTF8); } - - public static void write(Writer out, Iterator<Triple> iter, CharSpace charSpace) - { - StreamRDF s = StreamRDFLib.writer(out, charSpace) ; - write$(s, iter) ; + + public static void write(Writer out, Iterator<Triple> iter, CharSpace charSpace) { + StreamRDF s = StreamRDFLib.writer(out, charSpace); + write$(s, iter); } - private static void write$(StreamRDF s, Iterator<Triple> iter) - { - s.start() ; - StreamRDFOps.sendTriplesToStream(iter, s) ; + private static void write$(StreamRDF s, Iterator<Triple> iter) { + s.start(); + StreamRDFOps.sendTriplesToStream(iter, s); s.finish(); } - private final CharSpace charSpace ; + private final CharSpace charSpace; - public NTriplesWriter() - { this(UTF8); } - - public NTriplesWriter(CharSpace charSpace) - { - this.charSpace = charSpace ; + public NTriplesWriter() { + this(UTF8); + } + + public NTriplesWriter(CharSpace charSpace) { + this.charSpace = charSpace; } @Override - public Lang getLang() - { - return Lang.NTRIPLES ; + public Lang getLang() { + return Lang.NTRIPLES; } @Override - public void write(Writer out, Graph graph, PrefixMap prefixMap, String baseURI, Context context) - { - Iterator<Triple> iter = graph.find(null, null, null) ; + public void write(Writer out, Graph graph, PrefixMap prefixMap, String baseURI, Context context) { + Iterator<Triple> iter = graph.find(null, null, null); if ( charSpace == UTF8 ) - write(out, iter) ; - else - { - StreamRDF s = new WriterStreamRDFPlain(IO.wrap(out), ASCII) ; - write$(s, iter) ; + write(out, iter); + else { + StreamRDF s = new WriterStreamRDFPlain(IO.wrap(out), ASCII); + write$(s, iter); } } @Override - public void write(OutputStream out, Graph graph, PrefixMap prefixMap, String baseURI, Context context) - { - Iterator<Triple> iter = graph.find(null, null, null) ; + public void write(OutputStream out, Graph graph, PrefixMap prefixMap, String baseURI, Context context) { + Iterator<Triple> iter = graph.find(null, null, null); if ( charSpace == UTF8 ) - write(out, iter) ; - else - { - StreamRDF s = new WriterStreamRDFPlain(IO.wrapASCII(out), ASCII) ; - write$(s, iter) ; + write(out, iter); + else { + StreamRDF s = new WriterStreamRDFPlain(IO.wrapASCII(out), ASCII); + write$(s, iter); } - + } } diff --git a/jena-arq/src/main/java/org/apache/jena/riot/writer/NullWriter.java b/jena-arq/src/main/java/org/apache/jena/riot/writer/NullWriter.java index 9a61f1bae8..ad5bf6a7c2 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/writer/NullWriter.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/writer/NullWriter.java @@ -18,42 +18,44 @@ package org.apache.jena.riot.writer; -import java.io.OutputStream ; -import java.io.Writer ; - -import org.apache.jena.riot.Lang ; -import org.apache.jena.riot.RDFFormat ; -import org.apache.jena.riot.WriterDatasetRIOT ; -import org.apache.jena.riot.WriterDatasetRIOTFactory ; -import org.apache.jena.riot.system.PrefixMap ; -import org.apache.jena.sparql.core.DatasetGraph ; -import org.apache.jena.sparql.util.Context ; - -/** Null writer for datasets - can be used for RDF graphs via the adapter in from RiotWriterLib */ -public class NullWriter implements WriterDatasetRIOT -{ +import java.io.OutputStream; +import java.io.Writer; + +import org.apache.jena.riot.Lang; +import org.apache.jena.riot.RDFFormat; +import org.apache.jena.riot.WriterDatasetRIOT; +import org.apache.jena.riot.WriterDatasetRIOTFactory; +import org.apache.jena.riot.system.PrefixMap; +import org.apache.jena.sparql.core.DatasetGraph; +import org.apache.jena.sparql.util.Context; + +/** + * Null writer for datasets. + * <p> + * A sink for writer output. + */ +public class NullWriter implements WriterDatasetRIOT { public static WriterDatasetRIOTFactory factory = new WriterDatasetRIOTFactory() { @Override - public WriterDatasetRIOT create(RDFFormat syntaxForm) - { - return new NullWriter(syntaxForm) ; - }} ; - - private RDFFormat format ; - - private NullWriter(RDFFormat format) { this.format = format ; } - + public WriterDatasetRIOT create(RDFFormat syntaxForm) { + return new NullWriter(syntaxForm); + } + }; + + private RDFFormat format; + + private NullWriter(RDFFormat format) { + this.format = format; + } + @Override - public Lang getLang() - { - return format.getLang() ; + public Lang getLang() { + return format.getLang(); } @Override - public void write(OutputStream out, DatasetGraph datasetGraph, PrefixMap prefixMap, String baseURI, Context context) - {} + public void write(OutputStream out, DatasetGraph datasetGraph, PrefixMap prefixMap, String baseURI, Context context) {} @Override - public void write(Writer out, DatasetGraph datasetGraph, PrefixMap prefixMap, String baseURI, Context context) - {} + public void write(Writer out, DatasetGraph datasetGraph, PrefixMap prefixMap, String baseURI, Context context) {} } diff --git a/jena-arq/src/main/java/org/apache/jena/riot/writer/RDFJSONWriter.java b/jena-arq/src/main/java/org/apache/jena/riot/writer/RDFJSONWriter.java index 5923e7ec7e..ca34923ec6 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/writer/RDFJSONWriter.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/writer/RDFJSONWriter.java @@ -18,26 +18,26 @@ package org.apache.jena.riot.writer; -import java.io.OutputStream ; -import java.io.Writer ; -import java.util.HashMap ; -import java.util.HashSet ; -import java.util.Map ; -import java.util.Set ; +import java.io.OutputStream; +import java.io.Writer; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; -import org.apache.jena.atlas.io.IndentedWriter ; -import org.apache.jena.atlas.json.io.JSWriter ; -import org.apache.jena.atlas.lib.Pair ; -import org.apache.jena.graph.Graph ; -import org.apache.jena.graph.GraphUtil ; -import org.apache.jena.graph.Node ; -import org.apache.jena.graph.Triple ; -import org.apache.jena.riot.Lang ; -import org.apache.jena.riot.RiotException ; -import org.apache.jena.riot.system.PrefixMap ; -import org.apache.jena.sparql.util.Context ; -import org.apache.jena.sparql.util.NodeUtils ; -import org.apache.jena.util.iterator.ExtendedIterator ; +import org.apache.jena.atlas.io.IndentedWriter; +import org.apache.jena.atlas.json.io.JSWriter; +import org.apache.jena.atlas.lib.Pair; +import org.apache.jena.graph.Graph; +import org.apache.jena.graph.GraphUtil; +import org.apache.jena.graph.Node; +import org.apache.jena.graph.Triple; +import org.apache.jena.riot.Lang; +import org.apache.jena.riot.RiotException; +import org.apache.jena.riot.system.PrefixMap; +import org.apache.jena.sparql.util.Context; +import org.apache.jena.sparql.util.NodeUtils; +import org.apache.jena.util.iterator.ExtendedIterator; /** * RDF-JSON. @@ -46,123 +46,122 @@ import org.apache.jena.util.iterator.ExtendedIterator ; * * @see <a href="http://www.w3.org/TR/rdf-json/";>http://www.w3.org/TR/rdf-json/</a> */ -public class RDFJSONWriter extends WriterGraphRIOTBase -{ +public class RDFJSONWriter extends WriterGraphRIOTBase { public RDFJSONWriter() {} - public static void output(OutputStream out, Graph graph) { - output(new JSWriter(out), graph ) ; - } + public static void output(OutputStream out, Graph graph) { + output(new JSWriter(out), graph); + } - public static void output(Writer out, Graph graph) { - output(new JSWriter(new IndentedWriterEx(out)), graph ) ; - } + public static void output(Writer out, Graph graph) { + output(new JSWriter(new IndentedWriterEx(out)), graph); + } - @Override - public Lang getLang() - { - return Lang.RDFJSON ; + @Override + public Lang getLang() { + return Lang.RDFJSON; } @Override - public void write(Writer out, Graph graph, PrefixMap prefixMap, String baseURI, Context context) - { - output(out, graph) ; + public void write(Writer out, Graph graph, PrefixMap prefixMap, String baseURI, Context context) { + output(out, graph); } @Override - public void write(OutputStream out, Graph graph, PrefixMap prefixMap, String baseURI, Context context) - { - output(out, graph) ; + public void write(OutputStream out, Graph graph, PrefixMap prefixMap, String baseURI, Context context) { + output(out, graph); } private static void output(JSWriter out, Graph graph) { - out.startOutput() ; - out.startObject(); + out.startOutput(); + out.startObject(); - ExtendedIterator<Node> subjects = GraphUtil.listSubjects(graph, Node.ANY, Node.ANY) ; - try { - Map<Node, Set<Node>> predicates = new HashMap<>() ; - while ( subjects.hasNext() ) { - Node subject = subjects.next() ; - ExtendedIterator<Triple> triples = graph.find(subject, Node.ANY, Node.ANY) ; - try { - while ( triples.hasNext() ) { - Triple triple = triples.next() ; - Node p = triple.getPredicate() ; - if ( predicates.containsKey(p) ) { - predicates.get(p).add(triple.getObject()) ; - } else { - Set<Node> objects = new HashSet<>() ; - objects.add(triple.getObject()) ; - predicates.put(p, objects) ; - } - } - } finally { - if ( triples != null ) triples.close() ; - } - send(out, new Pair<>(subject, predicates)) ; - predicates.clear() ; - } - } finally { - if ( subjects != null ) subjects.close() ; - out.finishObject(); - out.finishOutput() ; - } - } + ExtendedIterator<Node> subjects = GraphUtil.listSubjects(graph, Node.ANY, Node.ANY); + try { + Map<Node, Set<Node>> predicates = new HashMap<>(); + while (subjects.hasNext()) { + Node subject = subjects.next(); + ExtendedIterator<Triple> triples = graph.find(subject, Node.ANY, Node.ANY); + try { + while (triples.hasNext()) { + Triple triple = triples.next(); + Node p = triple.getPredicate(); + if ( predicates.containsKey(p) ) { + predicates.get(p).add(triple.getObject()); + } else { + Set<Node> objects = new HashSet<>(); + objects.add(triple.getObject()); + predicates.put(p, objects); + } + } + } + finally { + if ( triples != null ) + triples.close(); + } + send(out, new Pair<>(subject, predicates)); + predicates.clear(); + } + } + finally { + if ( subjects != null ) + subjects.close(); + out.finishObject(); + out.finishOutput(); + } + } private static void send(JSWriter out, Pair<Node, Map<Node, Set<Node>>> item) { - Node s = item.getLeft() ; + Node s = item.getLeft(); if ( s.isBlank() ) { - out.key("_:" + s.getBlankNodeLabel()) ; + out.key("_:" + s.getBlankNodeLabel()); } else if ( s.isURI() ) { - out.key(s.getURI()) ; + out.key(s.getURI()); } else { - throw new RiotException ("Only URIs or blank nodes are legal subjects.") ; + throw new RiotException("Only URIs or blank nodes are legal subjects."); } - out.startObject() ; - // out.pair(key, value) ; - Map<Node, Set<Node>> predicates = item.getRight() ; - for (Node p : predicates.keySet() ) { - out.key(p.getURI()) ; - out.startArray() ; - Set<Node> objects = predicates.get(p) ; + out.startObject(); + // out.pair(key, value); + Map<Node, Set<Node>> predicates = item.getRight(); + for ( Node p : predicates.keySet() ) { + out.key(p.getURI()); + out.startArray(); + Set<Node> objects = predicates.get(p); int i = 0; for ( Node o : objects ) { - out.startObject() ; + out.startObject(); if ( o.isBlank() ) { - out.pair("type", "bnode") ; - out.pair("value", "_:" + o.getBlankNodeLabel()) ; + out.pair("type", "bnode"); + out.pair("value", "_:" + o.getBlankNodeLabel()); } else if ( o.isURI() ) { - out.pair("type", "uri") ; - out.pair("value", o.getURI()) ; + out.pair("type", "uri"); + out.pair("value", o.getURI()); } else if ( o.isLiteral() ) { - String lex = o.getLiteralLexicalForm() ; - out.pair("type", "literal") ; - out.pair("value", lex) ; + String lex = o.getLiteralLexicalForm(); + out.pair("type", "literal"); + out.pair("value", lex); if ( NodeUtils.isSimpleString(o) ) { // No-op. } else if ( NodeUtils.isLangString(o) ) { - String lang = o.getLiteralLanguage() ; - out.pair("lang", lang) ; + String lang = o.getLiteralLanguage(); + out.pair("lang", lang); } else { // Datatype, nothing special. - String dt = o.getLiteralDatatypeURI() ; - out.pair("datatype", dt) ; + String dt = o.getLiteralDatatypeURI(); + out.pair("datatype", dt); } } - out.finishObject() ; - if (i < objects.size() - 1) - { + out.finishObject(); + if ( i < objects.size() - 1 ) { out.arraySep(); } i++; } - out.finishArray() ; + out.finishArray(); } - out.finishObject() ; + out.finishObject(); } private static class IndentedWriterEx extends IndentedWriter { diff --git a/jena-arq/src/main/java/org/apache/jena/riot/writer/RDFXMLAbbrevWriter.java b/jena-arq/src/main/java/org/apache/jena/riot/writer/RDFXMLAbbrevWriter.java index 9a3fec82c5..17f37c71dc 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/writer/RDFXMLAbbrevWriter.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/writer/RDFXMLAbbrevWriter.java @@ -18,25 +18,24 @@ package org.apache.jena.riot.writer; -import org.apache.jena.rdf.model.RDFWriterI ; -import org.apache.jena.rdfxml.xmloutput.impl.RDFXML_Abbrev ; -import org.apache.jena.riot.Lang ; -import org.apache.jena.riot.adapters.AdapterRDFWriter ; +import org.apache.jena.rdf.model.RDFWriterI; +import org.apache.jena.rdfxml.xmloutput.impl.RDFXML_Abbrev; +import org.apache.jena.riot.Lang; +import org.apache.jena.riot.adapters.AdapterRDFWriter; /** Wrapper to the RDF/XML writer (preRIOT). */ -public class RDFXMLAbbrevWriter extends AdapterRDFWriter -{ - - public RDFXMLAbbrevWriter() {} - +public class RDFXMLAbbrevWriter extends AdapterRDFWriter { + + public RDFXMLAbbrevWriter() {} + @Override - protected RDFWriterI create() { return new RDFXML_Abbrev() ; } - + protected RDFWriterI create() { + return new RDFXML_Abbrev(); + } + @Override - public Lang getLang() - { - return Lang.RDFXML ; + public Lang getLang() { + return Lang.RDFXML; } } - diff --git a/jena-arq/src/main/java/org/apache/jena/riot/writer/RDFXMLPlainWriter.java b/jena-arq/src/main/java/org/apache/jena/riot/writer/RDFXMLPlainWriter.java index f11abe5ee3..4475bdc1cd 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/writer/RDFXMLPlainWriter.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/writer/RDFXMLPlainWriter.java @@ -18,23 +18,23 @@ package org.apache.jena.riot.writer; -import org.apache.jena.rdf.model.RDFWriterI ; -import org.apache.jena.rdfxml.xmloutput.impl.RDFXML_Basic ; -import org.apache.jena.riot.Lang ; -import org.apache.jena.riot.adapters.AdapterRDFWriter ; +import org.apache.jena.rdf.model.RDFWriterI; +import org.apache.jena.rdfxml.xmloutput.impl.RDFXML_Basic; +import org.apache.jena.riot.Lang; +import org.apache.jena.riot.adapters.AdapterRDFWriter; /** Wrapper to the RDF/XML writer (preRIOT). */ -public class RDFXMLPlainWriter extends AdapterRDFWriter -{ +public class RDFXMLPlainWriter extends AdapterRDFWriter { public RDFXMLPlainWriter() {} - + @Override - protected RDFWriterI create() { return new RDFXML_Basic() ; } - + protected RDFWriterI create() { + return new RDFXML_Basic(); + } + @Override - public Lang getLang() - { - return Lang.RDFXML ; + public Lang getLang() { + return Lang.RDFXML; } } diff --git a/jena-arq/src/main/java/org/apache/jena/riot/writer/StreamWriterTriX.java b/jena-arq/src/main/java/org/apache/jena/riot/writer/StreamWriterTriX.java index 5aac4544dc..b9b0650511 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/writer/StreamWriterTriX.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/writer/StreamWriterTriX.java @@ -18,21 +18,21 @@ package org.apache.jena.riot.writer; -import java.io.OutputStream ; -import java.util.Objects ; - -import org.apache.jena.atlas.io.IndentedWriter ; -import org.apache.jena.datatypes.xsd.impl.XMLLiteralType ; -import org.apache.jena.graph.Node ; -import org.apache.jena.graph.Triple ; -import org.apache.jena.rdf.model.impl.Util ; -import org.apache.jena.riot.RiotException ; -import org.apache.jena.riot.lang.ReaderTriX ; -import org.apache.jena.riot.lang.TriX ; -import org.apache.jena.riot.system.PrefixMap ; -import org.apache.jena.riot.system.PrefixMapFactory ; -import org.apache.jena.riot.system.StreamRDF ; -import org.apache.jena.sparql.core.Quad ; +import java.io.OutputStream; +import java.util.Objects; + +import org.apache.jena.atlas.io.IndentedWriter; +import org.apache.jena.datatypes.xsd.impl.XMLLiteralType; +import org.apache.jena.graph.Node; +import org.apache.jena.graph.Triple; +import org.apache.jena.rdf.model.impl.Util; +import org.apache.jena.riot.RiotException; +import org.apache.jena.riot.lang.ReaderTriX; +import org.apache.jena.riot.lang.TriX; +import org.apache.jena.riot.system.PrefixMap; +import org.apache.jena.riot.system.PrefixMapFactory; +import org.apache.jena.riot.system.StreamRDF; +import org.apache.jena.sparql.core.Quad; /** Write TriX by streaming. @@ -53,12 +53,12 @@ public class StreamWriterTriX implements StreamRDF { */ private final static String rdfXMLLiteral = XMLLiteralType.XMLLiteralTypeURI; - private final IndentedWriter out ; - private Node gn = null ; - private boolean inGraph = false ; + private final IndentedWriter out; + private Node gn = null; + private boolean inGraph = false; private final PrefixMap pmap; // StreamRDF.start/finish count - private int depth = 0 ; + private int depth = 0; public StreamWriterTriX(OutputStream out, PrefixMap prefixMap) { this(new IndentedWriter(out), prefixMap); @@ -80,15 +80,15 @@ public class StreamWriterTriX implements StreamRDF { @Override public void start() { if ( depth == 0 ) writeStart(); - depth ++ ; + depth ++; } @Override public void finish() { - depth-- ; + depth--; if ( depth != 0 ) - return ; + return; writeFinish(); - out.flush() ; + out.flush(); } @Override public void base(String base) {} // Ignore. @@ -101,201 +101,201 @@ public class StreamWriterTriX implements StreamRDF { @Override public void triple(Triple triple) { if ( inGraph && gn != null ) { - StreamWriterTriX.endTag(out, TriX.tagGraph) ; - out.println() ; - inGraph = false ; + StreamWriterTriX.endTag(out, TriX.tagGraph); + out.println(); + inGraph = false; } if ( ! inGraph ) { - StreamWriterTriX.startTag(out, TriX.tagGraph) ; - out.println() ; + StreamWriterTriX.startTag(out, TriX.tagGraph); + out.println(); } - inGraph = true ; - gn = null ; + inGraph = true; + gn = null; //end graph? - StreamWriterTriX.write(out, triple, pmap) ; + StreamWriterTriX.write(out, triple, pmap); } @Override public void quad(Quad quad) { - Node g = quad.getGraph() ; + Node g = quad.getGraph(); if ( g == null || Quad.isDefaultGraph(g) ) { - triple(quad.asTriple()) ; - return ; + triple(quad.asTriple()); + return; } if ( inGraph ) { if ( ! Objects.equals(g, gn) ) { - StreamWriterTriX.endTag(out, TriX.tagGraph) ; - out.println() ; - inGraph = false ; + StreamWriterTriX.endTag(out, TriX.tagGraph); + out.println(); + inGraph = false; } } if ( ! inGraph ) { - StreamWriterTriX.startTag(out, TriX.tagGraph) ; - out.println() ; + StreamWriterTriX.startTag(out, TriX.tagGraph); + out.println(); if ( gn == null || ! Quad.isDefaultGraph(gn) ) { - gn = quad.getGraph() ; - StreamWriterTriX.write(out, gn, pmap) ; + gn = quad.getGraph(); + StreamWriterTriX.write(out, gn, pmap); } } - inGraph = true ; - gn = g ; - StreamWriterTriX.write(out, quad.asTriple(), pmap) ; + inGraph = true; + gn = g; + StreamWriterTriX.write(out, quad.asTriple(), pmap); } private static void write(IndentedWriter out, Triple triple, PrefixMap prefixMap) { - out.println("<triple>") ; + out.println("<triple>"); out.incIndent(); - write(out, triple.getSubject(), prefixMap) ; - write(out, triple.getPredicate(), prefixMap) ; - write(out, triple.getObject(), prefixMap) ; + write(out, triple.getSubject(), prefixMap); + write(out, triple.getPredicate(), prefixMap); + write(out, triple.getObject(), prefixMap); out.decIndent(); - out.println("</triple>") ; + out.println("</triple>"); } private static void write(IndentedWriter out, Node node, PrefixMap prefixMap) { if ( node.isURI() ) { - String uri = node.getURI() ; + String uri = node.getURI(); // The decent use of TriX is very regular output as we do not use <qname>. // See notes on qnames above. if ( prefixMap != null ) { - String abbrev = prefixMap.abbreviate(uri) ; + String abbrev = prefixMap.abbreviate(uri); if ( abbrev != null ) { - startTag(out, TriX.tagQName) ; - writeText(out, abbrev) ; - endTag(out, TriX.tagQName) ; - out.println() ; - return ; + startTag(out, TriX.tagQName); + writeText(out, abbrev); + endTag(out, TriX.tagQName); + out.println(); + return; } } - startTag(out, TriX.tagURI) ; - writeText(out, node.getURI()) ; - endTag(out, TriX.tagURI) ; - out.println() ; - return ; + startTag(out, TriX.tagURI); + writeText(out, node.getURI()); + endTag(out, TriX.tagURI); + out.println(); + return; } if ( node.isBlank() ) { - startTag(out, TriX.tagId) ; - writeText(out, node.getBlankNodeLabel()) ; - endTag(out, TriX.tagId) ; - out.println() ; - return ; + startTag(out, TriX.tagId); + writeText(out, node.getBlankNodeLabel()); + endTag(out, TriX.tagId); + out.println(); + return; } if ( node.isLiteral() ) { // RDF 1.1 if ( Util.isSimpleString(node) ) { - startTag(out, TriX.tagPlainLiteral) ; - writeTextNoIndent(out, node.getLiteralLexicalForm()) ; - endTag(out, TriX.tagPlainLiteral) ; - out.println() ; - return ; + startTag(out, TriX.tagPlainLiteral); + writeTextNoIndent(out, node.getLiteralLexicalForm()); + endTag(out, TriX.tagPlainLiteral); + out.println(); + return; } if ( Util.isLangString(node) ) { - String lang = node.getLiteralLanguage() ; - startTag(out, TriX.tagPlainLiteral, "xml:lang", lang) ; - writeTextNoIndent(out, node.getLiteralLexicalForm()) ; - endTag(out, TriX.tagPlainLiteral) ; - out.println() ; - return ; + String lang = node.getLiteralLanguage(); + startTag(out, TriX.tagPlainLiteral, "xml:lang", lang); + writeTextNoIndent(out, node.getLiteralLexicalForm()); + endTag(out, TriX.tagPlainLiteral); + out.println(); + return; } - String dt = node.getLiteralDatatypeURI() ; - startTag(out, TriX.tagTypedLiteral, TriX.attrDatatype, dt) ; - String lex = node.getLiteralLexicalForm() ; + String dt = node.getLiteralDatatypeURI(); + startTag(out, TriX.tagTypedLiteral, TriX.attrDatatype, dt); + String lex = node.getLiteralLexicalForm(); if ( rdfXMLLiteral.equals(dt) ) { - int x = out.getAbsoluteIndent() ; - out.setAbsoluteIndent(0) ; - out.print(lex) ; // Write raw - out.setAbsoluteIndent(x) ; + int x = out.getAbsoluteIndent(); + out.setAbsoluteIndent(0); + out.print(lex); // Write raw + out.setAbsoluteIndent(x); } else - writeTextNoIndent(out, lex) ; - endTag(out, TriX.tagTypedLiteral) ; - out.println() ; - return ; + writeTextNoIndent(out, lex); + endTag(out, TriX.tagTypedLiteral); + out.println(); + return; } if ( node.isNodeTriple() ) { - StreamWriterTriX.write(out, node.getTriple(), prefixMap) ; + StreamWriterTriX.write(out, node.getTriple(), prefixMap); return; } - throw new RiotException("Not a concrete node: "+node) ; + throw new RiotException("Not a concrete node: "+node); } private static void writeText(IndentedWriter out, String string) { - string = Util.substituteEntitiesInElementContent(string) ; - out.print(string) ; + string = Util.substituteEntitiesInElementContent(string); + out.print(string); } private static void writeTextNoIndent(IndentedWriter out, String string) { - int x = out.getAbsoluteIndent() ; - out.setAbsoluteIndent(0) ; - writeText(out, string) ; - out.setAbsoluteIndent(x) ; + int x = out.getAbsoluteIndent(); + out.setAbsoluteIndent(0); + writeText(out, string); + out.setAbsoluteIndent(x); } private static void startXML(IndentedWriter out) { - //out.println("<?xml version=\"1.0\" encoding=\"UTF-8\"?>") ; + //out.println("<?xml version=\"1.0\" encoding=\"UTF-8\"?>"); } void writeStart() { - StreamWriterTriX.startXML(out) ; + StreamWriterTriX.startXML(out); // Write using the element name from the W3C DTD. if ( pmap == null || pmap.isEmpty() ) - StreamWriterTriX.startTag(out, TriX.tagTriX, "xmlns", TriX.NS) ; + StreamWriterTriX.startTag(out, TriX.tagTriX, "xmlns", TriX.NS); else - StreamWriterTriX.startTagNS(out, TriX.tagTriX, "xmlns", TriX.NS, pmap) ; - out.println() ; + StreamWriterTriX.startTagNS(out, TriX.tagTriX, "xmlns", TriX.NS, pmap); + out.println(); } private void writeFinish() { if ( inGraph ) { - StreamWriterTriX.endTag(out, TriX.tagGraph) ; - out.println() ; + StreamWriterTriX.endTag(out, TriX.tagGraph); + out.println(); } - StreamWriterTriX.endTag(out, TriX.tagTriX) ; - out.println() ; + StreamWriterTriX.endTag(out, TriX.tagTriX); + out.println(); } private static void startTag(IndentedWriter out, String text) { - out.print("<") ; - out.print(text) ; - out.print(">") ; + out.print("<"); + out.print(text); + out.print(">"); out.incIndent(); } private static void startTag(IndentedWriter out, String text, String attr, String attrValue) { - out.print("<") ; - out.print(text) ; - out.print(" ") ; - out.print(attr) ; - out.print("=\"") ; - attrValue = Util.substituteStandardEntities(attrValue) ; - out.print(attrValue) ; - out.print("\"") ; - out.print(">") ; + out.print("<"); + out.print(text); + out.print(" "); + out.print(attr); + out.print("=\""); + attrValue = Util.substituteStandardEntities(attrValue); + out.print(attrValue); + out.print("\""); + out.print(">"); out.incIndent(); } // Write start with namespaces. private static void startTagNS(IndentedWriter out, String text, String attr, String attrValue, PrefixMap pmap) { - out.print("<") ; - out.print(text) ; - out.print(" ") ; + out.print("<"); + out.print(text); + out.print(" "); // Alignment of namespaces. int offset = out.getCurrentOffset(); - out.print("xmlns") ; - out.print("=\"") ; - attrValue = Util.substituteStandardEntities(attrValue) ; - out.print(attrValue) ; - out.print("\"") ; + out.print("xmlns"); + out.print("=\""); + attrValue = Util.substituteStandardEntities(attrValue); + out.print(attrValue); + out.print("\""); // prefixes as XML namespaces. // Can't write the empty namespace - it's used by TriX itself in this writer. @@ -312,15 +312,15 @@ public class StreamWriterTriX implements StreamRDF { }); out.decIndent(offset); - out.print(">") ; + out.print(">"); out.incIndent(); } private static void endTag(IndentedWriter out, String text) { out.decIndent(); - out.print("</") ; - out.print(text) ; - out.print(">") ; + out.print("</"); + out.print(text); + out.print(">"); } } diff --git a/jena-arq/src/main/java/org/apache/jena/riot/writer/TriGWriter.java b/jena-arq/src/main/java/org/apache/jena/riot/writer/TriGWriter.java index c236bb4cdc..629b654d51 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/writer/TriGWriter.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/writer/TriGWriter.java @@ -22,84 +22,84 @@ import static org.apache.jena.riot.writer.WriterConst.*; import java.util.Set; -import org.apache.jena.atlas.io.IndentedWriter ; +import org.apache.jena.atlas.io.IndentedWriter; import org.apache.jena.atlas.iterator.Iter; -import org.apache.jena.graph.Node ; -import org.apache.jena.riot.system.PrefixMap ; -import org.apache.jena.sparql.core.DatasetGraph ; -import org.apache.jena.sparql.core.Quad ; -import org.apache.jena.sparql.util.Context ; +import org.apache.jena.graph.Node; +import org.apache.jena.riot.system.PrefixMap; +import org.apache.jena.sparql.core.DatasetGraph; +import org.apache.jena.sparql.core.Quad; +import org.apache.jena.sparql.util.Context; /** TriG pretty writer */ public class TriGWriter extends TriGWriterBase { @Override protected void output(IndentedWriter iOut, DatasetGraph dsg, PrefixMap prefixMap, String baseURI, Context context) { - TriGWriter$ w = new TriGWriter$(iOut, prefixMap, baseURI, context) ; - w.write(dsg) ; + TriGWriter$ w = new TriGWriter$(iOut, prefixMap, baseURI, context); + w.write(dsg); } private static class TriGWriter$ extends TurtleShell { TriGWriter$(IndentedWriter out, PrefixMap prefixMap, String baseURI, Context context) { - super(out, prefixMap, baseURI, context) ; + super(out, prefixMap, baseURI, context); } private void write(DatasetGraph dsg) { - writeBase(baseURI) ; - writePrefixes(prefixMap) ; + writeBase(baseURI); + writePrefixes(prefixMap); if ( !prefixMap.isEmpty() && !dsg.isEmpty() ) - out.println() ; + out.println(); Set<Node> graphNames = Iter.toSet(dsg.listGraphNodes()); - boolean anyGraphOutput = writeGraphTriG(dsg, null, graphNames) ; + boolean anyGraphOutput = writeGraphTriG(dsg, null, graphNames); for ( Node gn : graphNames ) { if ( anyGraphOutput ) - out.println() ; - anyGraphOutput |= writeGraphTriG(dsg, gn, graphNames) ; + out.println(); + anyGraphOutput |= writeGraphTriG(dsg, gn, graphNames); } } /** Return true if anything written */ private boolean writeGraphTriG(DatasetGraph dsg, Node name, Set<Node> graphNames) { - boolean dftGraph = ( name == null || name == Quad.defaultGraphNodeGenerated ) ; + boolean dftGraph = ( name == null || name == Quad.defaultGraphNodeGenerated ); if ( dftGraph && dsg.getDefaultGraph().isEmpty() ) - return false ; + return false; if ( dftGraph && ! GDFT_BRACE ) { // Non-empty default graph, no braces. // No indenting. - writeGraphTTL(dsg, name, graphNames) ; - return true ; + writeGraphTTL(dsg, name, graphNames); + return true; } // The graph will go in braces, whether non-empty default graph or a named graph. - boolean NL_START = ( dftGraph ? NL_GDFT_START : NL_GNMD_START ) ; - boolean NL_END = ( dftGraph ? NL_GDFT_END : NL_GNMD_END ) ; - int INDENT_GRAPH = ( dftGraph ? INDENT_GDFT : INDENT_GNMD ) ; + boolean NL_START = ( dftGraph ? NL_GDFT_START : NL_GNMD_START ); + boolean NL_END = ( dftGraph ? NL_GDFT_END : NL_GNMD_END ); + int INDENT_GRAPH = ( dftGraph ? INDENT_GDFT : INDENT_GNMD ); if ( !dftGraph ) { - writeNode(name) ; - out.print(" ") ; + writeNode(name); + out.print(" "); } - out.print("{") ; + out.print("{"); if ( NL_START ) - out.println() ; + out.println(); else - out.print(" ") ; + out.print(" "); - out.incIndent(INDENT_GRAPH) ; - writeGraphTTL(dsg, name, graphNames) ; - out.decIndent(INDENT_GRAPH) ; + out.incIndent(INDENT_GRAPH); + writeGraphTTL(dsg, name, graphNames); + out.decIndent(INDENT_GRAPH); if ( NL_END ) - out.ensureStartOfLine() ; - out.println("}") ; - return true ; + out.ensureStartOfLine(); + out.println("}"); + return true; } } } diff --git a/jena-arq/src/main/java/org/apache/jena/riot/writer/TriGWriterBase.java b/jena-arq/src/main/java/org/apache/jena/riot/writer/TriGWriterBase.java index 23de43c11d..22be1b129f 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/writer/TriGWriterBase.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/writer/TriGWriterBase.java @@ -16,18 +16,18 @@ * limitations under the License. */ -package org.apache.jena.riot.writer ; +package org.apache.jena.riot.writer; -import java.io.OutputStream ; -import java.io.Writer ; +import java.io.OutputStream; +import java.io.Writer; -import org.apache.jena.atlas.io.IndentedWriter ; +import org.apache.jena.atlas.io.IndentedWriter; import org.apache.jena.irix.IRIs; -import org.apache.jena.riot.Lang ; -import org.apache.jena.riot.system.PrefixMap ; -import org.apache.jena.riot.system.RiotLib ; -import org.apache.jena.sparql.core.DatasetGraph ; -import org.apache.jena.sparql.util.Context ; +import org.apache.jena.riot.Lang; +import org.apache.jena.riot.system.PrefixMap; +import org.apache.jena.riot.system.RiotLib; +import org.apache.jena.sparql.core.DatasetGraph; +import org.apache.jena.sparql.util.Context; /** TriG writer base class - ways to invoke a TriG writer */ public abstract class TriGWriterBase extends WriterDatasetRIOTBase { diff --git a/jena-arq/src/main/java/org/apache/jena/riot/writer/TriGWriterBlocks.java b/jena-arq/src/main/java/org/apache/jena/riot/writer/TriGWriterBlocks.java index ce6a68a687..c9fc3b006a 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/writer/TriGWriterBlocks.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/writer/TriGWriterBlocks.java @@ -18,12 +18,12 @@ package org.apache.jena.riot.writer; -import org.apache.jena.atlas.io.IndentedWriter ; -import org.apache.jena.riot.system.PrefixMap ; -import org.apache.jena.riot.system.StreamRDFOps ; -import org.apache.jena.riot.system.StreamRDF ; -import org.apache.jena.sparql.core.DatasetGraph ; -import org.apache.jena.sparql.util.Context ; +import org.apache.jena.atlas.io.IndentedWriter; +import org.apache.jena.riot.system.PrefixMap; +import org.apache.jena.riot.system.StreamRDFOps; +import org.apache.jena.riot.system.StreamRDF; +import org.apache.jena.sparql.core.DatasetGraph; +import org.apache.jena.sparql.util.Context; /** TriG writer that streams - print in blocks of quads clustered * by adjacent same graph and same subject diff --git a/jena-arq/src/main/java/org/apache/jena/riot/writer/TriGWriterFlat.java b/jena-arq/src/main/java/org/apache/jena/riot/writer/TriGWriterFlat.java index 560a5c1026..a06becce1a 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/writer/TriGWriterFlat.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/writer/TriGWriterFlat.java @@ -18,12 +18,12 @@ package org.apache.jena.riot.writer; -import org.apache.jena.atlas.io.IndentedWriter ; -import org.apache.jena.riot.system.PrefixMap ; -import org.apache.jena.riot.system.StreamRDFOps ; -import org.apache.jena.riot.system.StreamRDF ; -import org.apache.jena.sparql.core.DatasetGraph ; -import org.apache.jena.sparql.util.Context ; +import org.apache.jena.atlas.io.IndentedWriter; +import org.apache.jena.riot.system.PrefixMap; +import org.apache.jena.riot.system.StreamRDFOps; +import org.apache.jena.riot.system.StreamRDF; +import org.apache.jena.sparql.core.DatasetGraph; +import org.apache.jena.sparql.util.Context; /** TriG writer that writes quads one per line * in TriG form with prefixes and short form literals (e.g. integers) diff --git a/jena-arq/src/main/java/org/apache/jena/riot/writer/TriGWriterLong.java b/jena-arq/src/main/java/org/apache/jena/riot/writer/TriGWriterLong.java index 4f47fde35e..ea472e26a6 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/writer/TriGWriterLong.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/writer/TriGWriterLong.java @@ -16,13 +16,13 @@ * limitations under the License. */ -package org.apache.jena.riot.writer ; +package org.apache.jena.riot.writer; -import org.apache.jena.atlas.io.IndentedWriter ; +import org.apache.jena.atlas.io.IndentedWriter; import org.apache.jena.riot.RIOT; -import org.apache.jena.riot.system.PrefixMap ; -import org.apache.jena.sparql.core.DatasetGraph ; -import org.apache.jena.sparql.util.Context ; +import org.apache.jena.riot.system.PrefixMap; +import org.apache.jena.sparql.core.DatasetGraph; +import org.apache.jena.sparql.util.Context; public class TriGWriterLong extends TriGWriter { diff --git a/jena-arq/src/main/java/org/apache/jena/riot/writer/TurtleWriter.java b/jena-arq/src/main/java/org/apache/jena/riot/writer/TurtleWriter.java index 4296995447..0141791342 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/writer/TurtleWriter.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/writer/TurtleWriter.java @@ -16,12 +16,12 @@ * limitations under the License. */ -package org.apache.jena.riot.writer ; +package org.apache.jena.riot.writer; -import org.apache.jena.atlas.io.IndentedWriter ; -import org.apache.jena.graph.Graph ; -import org.apache.jena.riot.system.PrefixMap ; -import org.apache.jena.sparql.util.Context ; +import org.apache.jena.atlas.io.IndentedWriter; +import org.apache.jena.graph.Graph; +import org.apache.jena.riot.system.PrefixMap; +import org.apache.jena.sparql.util.Context; public class TurtleWriter extends TurtleWriterBase { diff --git a/jena-arq/src/main/java/org/apache/jena/riot/writer/TurtleWriterBase.java b/jena-arq/src/main/java/org/apache/jena/riot/writer/TurtleWriterBase.java index 0f413c45c2..587046f748 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/writer/TurtleWriterBase.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/writer/TurtleWriterBase.java @@ -16,18 +16,18 @@ * limitations under the License. */ -package org.apache.jena.riot.writer ; +package org.apache.jena.riot.writer; -import java.io.OutputStream ; -import java.io.Writer ; +import java.io.OutputStream; +import java.io.Writer; -import org.apache.jena.atlas.io.IndentedWriter ; -import org.apache.jena.graph.Graph ; +import org.apache.jena.atlas.io.IndentedWriter; +import org.apache.jena.graph.Graph; import org.apache.jena.irix.IRIs; -import org.apache.jena.riot.Lang ; -import org.apache.jena.riot.system.PrefixMap ; -import org.apache.jena.riot.system.RiotLib ; -import org.apache.jena.sparql.util.Context ; +import org.apache.jena.riot.Lang; +import org.apache.jena.riot.system.PrefixMap; +import org.apache.jena.riot.system.RiotLib; +import org.apache.jena.sparql.util.Context; public abstract class TurtleWriterBase extends WriterGraphRIOTBase { @Override diff --git a/jena-arq/src/main/java/org/apache/jena/riot/writer/TurtleWriterBlocks.java b/jena-arq/src/main/java/org/apache/jena/riot/writer/TurtleWriterBlocks.java index ab8a81661b..f075bcd77d 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/writer/TurtleWriterBlocks.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/writer/TurtleWriterBlocks.java @@ -18,12 +18,12 @@ package org.apache.jena.riot.writer; -import org.apache.jena.atlas.io.IndentedWriter ; -import org.apache.jena.graph.Graph ; -import org.apache.jena.riot.system.PrefixMap ; -import org.apache.jena.riot.system.StreamRDFOps ; -import org.apache.jena.riot.system.StreamRDF ; -import org.apache.jena.sparql.util.Context ; +import org.apache.jena.atlas.io.IndentedWriter; +import org.apache.jena.graph.Graph; +import org.apache.jena.riot.system.PrefixMap; +import org.apache.jena.riot.system.StreamRDFOps; +import org.apache.jena.riot.system.StreamRDF; +import org.apache.jena.sparql.util.Context; /** Turtle writer that streams - print in blocks of triples formatted * by adjacent same subject. diff --git a/jena-arq/src/main/java/org/apache/jena/riot/writer/TurtleWriterFlat.java b/jena-arq/src/main/java/org/apache/jena/riot/writer/TurtleWriterFlat.java index 3d419d35a1..32240130a7 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/writer/TurtleWriterFlat.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/writer/TurtleWriterFlat.java @@ -18,12 +18,12 @@ package org.apache.jena.riot.writer; -import org.apache.jena.atlas.io.IndentedWriter ; -import org.apache.jena.graph.Graph ; -import org.apache.jena.riot.system.PrefixMap ; -import org.apache.jena.riot.system.StreamRDFOps ; -import org.apache.jena.riot.system.StreamRDF ; -import org.apache.jena.sparql.util.Context ; +import org.apache.jena.atlas.io.IndentedWriter; +import org.apache.jena.graph.Graph; +import org.apache.jena.riot.system.PrefixMap; +import org.apache.jena.riot.system.StreamRDFOps; +import org.apache.jena.riot.system.StreamRDF; +import org.apache.jena.sparql.util.Context; /** Write Turtle with one triple on one line with prefixed names, with short form literals (e.g. integers) */ public class TurtleWriterFlat extends TurtleWriterBase { diff --git a/jena-arq/src/main/java/org/apache/jena/riot/writer/TurtleWriterLong.java b/jena-arq/src/main/java/org/apache/jena/riot/writer/TurtleWriterLong.java index 086bddf566..412ad7661f 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/writer/TurtleWriterLong.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/writer/TurtleWriterLong.java @@ -16,13 +16,13 @@ * limitations under the License. */ -package org.apache.jena.riot.writer ; +package org.apache.jena.riot.writer; -import org.apache.jena.atlas.io.IndentedWriter ; -import org.apache.jena.graph.Graph ; +import org.apache.jena.atlas.io.IndentedWriter; +import org.apache.jena.graph.Graph; import org.apache.jena.riot.RIOT; -import org.apache.jena.riot.system.PrefixMap ; -import org.apache.jena.sparql.util.Context ; +import org.apache.jena.riot.system.PrefixMap; +import org.apache.jena.sparql.util.Context; public class TurtleWriterLong extends TurtleWriter { diff --git a/jena-arq/src/main/java/org/apache/jena/riot/writer/WriterConst.java b/jena-arq/src/main/java/org/apache/jena/riot/writer/WriterConst.java index a9e83c74bf..18c8b50c18 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/writer/WriterConst.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/writer/WriterConst.java @@ -18,71 +18,71 @@ package org.apache.jena.riot.writer; -import org.apache.jena.graph.Node ; -import org.apache.jena.vocabulary.RDF ; +import org.apache.jena.graph.Node; +import org.apache.jena.vocabulary.RDF; public class WriterConst { // See INDENT_PREDICATE -// public static final int MIN_SUBJECT = 4 ; - +// public static final int MIN_SUBJECT = 4; + /** Minimum width of the predicate columns. */ - public static final int MIN_PREDICATE = 4 ; + public static final int MIN_PREDICATE = 4; - /** Subjects longer than this have a NL after them. */ - public static final int LONG_SUBJECT = 20 ; + /** Subjects longer than this have a NL after them. */ + public static final int LONG_SUBJECT = 20; /** Predicates longer than this have a NL after them. */ - public static final int LONG_PREDICATE = 30 ; - + public static final int LONG_PREDICATE = 30; + /** The IRI column in a prefix. */ public static final int PREFIX_IRI = 15; - + // Pretty writers - do object lists? - // The block writers do not do object lists. - public static boolean OBJECT_LISTS = true ; - + // The block writers do not do object lists. + public static boolean OBJECT_LISTS = true; + // // Fixed column widths (unused). -// public static int COLW_SUBJECT = 6 ; -// public static int COLW_PREDICATE = 10 ; - - /** Column for start of predicate */ - public static final int INDENT_PREDICATE = 8 ; - +// public static int COLW_SUBJECT = 6; +// public static int COLW_PREDICATE = 10; + + /** Column for start of predicate */ + public static final int INDENT_PREDICATE = 8; + /** Column for start of object */ - public static final int INDENT_OBJECT = 8 ; + public static final int INDENT_OBJECT = 8; /** Minimum gap from S to P and from P to O */ - public static final int MIN_GAP = 2 ; + public static final int MIN_GAP = 2; /** Minimum gap from S to P */ - public static final int GAP_S_P = MIN_GAP ; + public static final int GAP_S_P = MIN_GAP; /** Minimum gap from P to O */ - public static final int GAP_P_O = MIN_GAP ; - + public static final int GAP_P_O = MIN_GAP; + // TriG constants. - /** Whether to put in {} for the default graph when pretty writing */ - public static final boolean GDFT_BRACE = false ; - - /** Whether to put in a newline after the opening { of a default graph block */ - public static final boolean NL_GDFT_START = false ; - /** Whether to put in a newline after the opening { of a named graph block */ - public static final boolean NL_GNMD_START = true ; - + /** Whether to put in {} for the default graph when pretty writing */ + public static final boolean GDFT_BRACE = false; + + /** Whether to put in a newline after the opening { of a default graph block */ + public static final boolean NL_GDFT_START = false; + /** Whether to put in a newline after the opening { of a named graph block */ + public static final boolean NL_GNMD_START = true; + /** Whether to put the closing } of a default graph block on a newline */ - public static final boolean NL_GDFT_END = true ; + public static final boolean NL_GDFT_END = true; /** Whether to put the closing } of a named graph block on a newline */ - public static final boolean NL_GNMD_END = true ; + public static final boolean NL_GNMD_END = true; /** Indent for triples in default graph blocks if inside {} */ - public static final int INDENT_GDFT = 2 ; + public static final int INDENT_GDFT = 2; /** Indent for trinples in named graph blocks */ - public static final int INDENT_GNMD = 4 ; + public static final int INDENT_GNMD = 4; // Constants. - public static final String rdfNS = RDF.getURI() ; - public static final Node RDF_type = RDF.Nodes.type ; - public static final Node RDF_First = RDF.Nodes.first ; - public static final Node RDF_Rest = RDF.Nodes.rest ; - public static final Node RDF_Nil = RDF.Nodes.nil ; + public static final String rdfNS = RDF.getURI(); + public static final Node RDF_type = RDF.Nodes.type; + public static final Node RDF_First = RDF.Nodes.first; + public static final Node RDF_Rest = RDF.Nodes.rest; + public static final Node RDF_Nil = RDF.Nodes.nil; } diff --git a/jena-arq/src/main/java/org/apache/jena/riot/writer/WriterDatasetRIOTBase.java b/jena-arq/src/main/java/org/apache/jena/riot/writer/WriterDatasetRIOTBase.java index 4101968c47..2ed5f68da5 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/writer/WriterDatasetRIOTBase.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/writer/WriterDatasetRIOTBase.java @@ -18,19 +18,18 @@ package org.apache.jena.riot.writer; -import java.io.OutputStream ; -import java.io.Writer ; +import java.io.OutputStream; +import java.io.Writer; -import org.apache.jena.riot.WriterDatasetRIOT ; -import org.apache.jena.riot.system.PrefixMap ; -import org.apache.jena.sparql.core.DatasetGraph ; -import org.apache.jena.sparql.util.Context ; +import org.apache.jena.riot.WriterDatasetRIOT; +import org.apache.jena.riot.system.PrefixMap; +import org.apache.jena.sparql.core.DatasetGraph; +import org.apache.jena.sparql.util.Context; -public abstract class WriterDatasetRIOTBase implements WriterDatasetRIOT -{ +public abstract class WriterDatasetRIOTBase implements WriterDatasetRIOT { @Override - public abstract void write(Writer out, DatasetGraph dataset, PrefixMap prefixMap, String baseURI, Context context) ; + public abstract void write(Writer out, DatasetGraph dataset, PrefixMap prefixMap, String baseURI, Context context); @Override - public abstract void write(OutputStream out, DatasetGraph dataset, PrefixMap prefixMap, String baseURI, Context context) ; + public abstract void write(OutputStream out, DatasetGraph dataset, PrefixMap prefixMap, String baseURI, Context context); } diff --git a/jena-arq/src/main/java/org/apache/jena/riot/writer/WriterGraphRIOTBase.java b/jena-arq/src/main/java/org/apache/jena/riot/writer/WriterGraphRIOTBase.java index af38f611a1..3264ea57ec 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/writer/WriterGraphRIOTBase.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/writer/WriterGraphRIOTBase.java @@ -18,19 +18,18 @@ package org.apache.jena.riot.writer; -import java.io.OutputStream ; -import java.io.Writer ; +import java.io.OutputStream; +import java.io.Writer; -import org.apache.jena.graph.Graph ; -import org.apache.jena.riot.WriterGraphRIOT ; -import org.apache.jena.riot.system.PrefixMap ; -import org.apache.jena.sparql.util.Context ; +import org.apache.jena.graph.Graph; +import org.apache.jena.riot.WriterGraphRIOT; +import org.apache.jena.riot.system.PrefixMap; +import org.apache.jena.sparql.util.Context; -public abstract class WriterGraphRIOTBase implements WriterGraphRIOT -{ +public abstract class WriterGraphRIOTBase implements WriterGraphRIOT { @Override - public abstract void write(Writer out, Graph graph, PrefixMap prefixMap, String baseURI, Context context) ; - + public abstract void write(Writer out, Graph graph, PrefixMap prefixMap, String baseURI, Context context); + @Override - public abstract void write(OutputStream out, Graph graph, PrefixMap prefixMap, String baseURI, Context context) ; + public abstract void write(OutputStream out, Graph graph, PrefixMap prefixMap, String baseURI, Context context); } diff --git a/jena-arq/src/main/java/org/apache/jena/riot/writer/WriterLib.java b/jena-arq/src/main/java/org/apache/jena/riot/writer/WriterLib.java index 5192be6cd7..4818dad497 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/writer/WriterLib.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/writer/WriterLib.java @@ -31,11 +31,11 @@ import org.apache.jena.sparql.util.Context; if ( context == null ) return DirectiveStyle.systemDefault; - Object x = context.get(RIOT.symTurtleDirectiveStyle) ; + Object x = context.get(RIOT.symTurtleDirectiveStyle); if ( x instanceof String s ) return DirectiveStyle.create(s); if ( x instanceof DirectiveStyle directive) - return directive ; + return directive; // Default choice; includes null in context. return DirectiveStyle.systemDefault; @@ -44,7 +44,7 @@ import org.apache.jena.sparql.util.Context; /*package*/ static IndentStyle indentStyle(Context context) { if ( context == null ) return dftIndentStyle; - Object x = context.get(RIOT.symTurtleIndentStyle) ; + Object x = context.get(RIOT.symTurtleIndentStyle); if ( x instanceof String s ) { IndentStyle style = IndentStyle.create(s); diff --git a/jena-arq/src/main/java/org/apache/jena/riot/writer/WriterStreamRDFBase.java b/jena-arq/src/main/java/org/apache/jena/riot/writer/WriterStreamRDFBase.java index cd826bb35d..7ea1d5a4e3 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/writer/WriterStreamRDFBase.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/writer/WriterStreamRDFBase.java @@ -18,21 +18,21 @@ package org.apache.jena.riot.writer; import static org.apache.jena.riot.writer.WriterConst.rdfNS; -import java.io.BufferedWriter ; -import java.io.OutputStream ; -import java.io.Writer ; +import java.io.BufferedWriter; +import java.io.OutputStream; +import java.io.Writer; -import org.apache.jena.atlas.io.IndentedWriter ; -import org.apache.jena.graph.Node ; -import org.apache.jena.graph.Triple ; +import org.apache.jena.atlas.io.IndentedWriter; +import org.apache.jena.graph.Node; +import org.apache.jena.graph.Triple; import org.apache.jena.riot.RIOT; -import org.apache.jena.riot.out.NodeFormatterTTL ; -import org.apache.jena.riot.out.NodeToLabel ; -import org.apache.jena.riot.system.PrefixMap ; -import org.apache.jena.riot.system.PrefixMapFactory ; -import org.apache.jena.riot.system.RiotLib ; -import org.apache.jena.riot.system.StreamRDF ; -import org.apache.jena.sparql.core.Quad ; +import org.apache.jena.riot.out.NodeFormatterTTL; +import org.apache.jena.riot.out.NodeToLabel; +import org.apache.jena.riot.system.PrefixMap; +import org.apache.jena.riot.system.PrefixMapFactory; +import org.apache.jena.riot.system.RiotLib; +import org.apache.jena.riot.system.StreamRDF; +import org.apache.jena.sparql.core.Quad; import org.apache.jena.sparql.util.Context; /** @@ -50,16 +50,16 @@ import org.apache.jena.sparql.util.Context; public abstract class WriterStreamRDFBase implements StreamRDF { // What did we do last? - protected boolean activeTripleData = false ; - protected boolean activeQuadData = false ; - protected boolean lastWasDirective = false ; + protected boolean activeTripleData = false; + protected boolean activeQuadData = false; + protected boolean lastWasDirective = false; - protected final PrefixMap pMap ; - protected String baseURI = null ; - protected final NodeToLabel nodeToLabel ; + protected final PrefixMap pMap; + protected String baseURI = null; + protected final NodeToLabel nodeToLabel; - protected NodeFormatterTTL fmt ; - protected final IndentedWriter out ; + protected NodeFormatterTTL fmt; + protected final IndentedWriter out; protected final DirectiveStyle directiveStyle; // Allows for ability to write RDF without writing the base URI. protected final boolean printBase; @@ -67,7 +67,7 @@ public abstract class WriterStreamRDFBase implements StreamRDF protected int countPrefixesForRDF = 0; protected WriterStreamRDFBase(OutputStream output, Context context) { - this(new IndentedWriter(output), context) ; + this(new IndentedWriter(output), context); } protected WriterStreamRDFBase(Writer output, Context context) { @@ -88,13 +88,13 @@ public abstract class WriterStreamRDFBase implements StreamRDF // Stream writing does not take an external base URI from the API "write" // call. The base URI is output if StreamRDF.base() called, which means BASE // was in the data stream. - this.out = output ; - this.baseURI = null ; - this.pMap = PrefixMapFactory.create() ; - this.nodeToLabel = nodeToLabel ; + this.out = output; + this.baseURI = null; + this.pMap = PrefixMapFactory.create(); + this.nodeToLabel = nodeToLabel; this.directiveStyle = directiveStyle; this.printBase = printBase; - setFormatter() ; + setFormatter(); } // Set and reset the formatter. It needs resetting if BASE is encountered. @@ -182,7 +182,7 @@ public abstract class WriterStreamRDFBase implements StreamRDF if ( countPrefixesForRDF <= 0 && WriterConst.RDF_type.equals(p) ) out.print('a'); else - outputNode(p) ; + outputNode(p); } // Subclass contract diff --git a/jena-arq/src/main/java/org/apache/jena/riot/writer/WriterStreamRDFBatched.java b/jena-arq/src/main/java/org/apache/jena/riot/writer/WriterStreamRDFBatched.java index a50f5355ae..755f78a5a8 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/writer/WriterStreamRDFBatched.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/writer/WriterStreamRDFBatched.java @@ -18,16 +18,16 @@ package org.apache.jena.riot.writer; -import java.io.OutputStream ; -import java.io.Writer ; -import java.util.ArrayList ; -import java.util.List ; +import java.io.OutputStream; +import java.io.Writer; +import java.util.ArrayList; +import java.util.List; import java.util.Objects; -import org.apache.jena.atlas.io.IndentedWriter ; -import org.apache.jena.graph.Node ; -import org.apache.jena.graph.Triple ; -import org.apache.jena.sparql.core.Quad ; +import org.apache.jena.atlas.io.IndentedWriter; +import org.apache.jena.graph.Node; +import org.apache.jena.graph.Triple; +import org.apache.jena.sparql.core.Quad; import org.apache.jena.sparql.util.Context; /** Convert the incoming print stream into batches. */ @@ -35,108 +35,108 @@ abstract class WriterStreamRDFBatched extends WriterStreamRDFBase { // This has nothing to do with printing except it's under WriterStreamRDFBase // so the operation is "print" - private Node currentSubject ; - private Node currentGraph ; - private List<Triple> batchTriples ; - private List<Quad> batchQuads ; + private Node currentSubject; + private Node currentGraph; + private List<Triple> batchTriples; + private List<Quad> batchQuads; public WriterStreamRDFBatched(OutputStream output, Context context) - { super(output, context) ; } - + { super(output, context); } + public WriterStreamRDFBatched(Writer output, Context context) - { super(output, context) ; } + { super(output, context); } public WriterStreamRDFBatched(IndentedWriter output, Context context) - { super(output, context) ; } + { super(output, context); } @Override - protected final void startData() { reset() ; } + protected final void startData() { reset(); } @Override - protected final void endData() { flush() ; } + protected final void endData() { flush(); } private void flush() { - finishBatchTriples(currentSubject) ; - finishBatchQuad(currentGraph, currentSubject) ; - finalizeRun() ; + finishBatchTriples(currentSubject); + finishBatchQuad(currentGraph, currentSubject); + finalizeRun(); } @Override protected final void reset() { - currentSubject = null ; - currentGraph = null ; - batchTriples = null ; - batchQuads = null ; + currentSubject = null; + currentGraph = null; + batchTriples = null; + batchQuads = null; } private void batch(Node g, Node s, boolean forTriples) { if ( !Objects.equals(g, currentGraph) || !Objects.equals(s, currentSubject) ) { - finishBatchTriples(currentSubject) ; - finishBatchQuad(currentGraph, currentSubject) ; + finishBatchTriples(currentSubject); + finishBatchQuad(currentGraph, currentSubject); if ( forTriples ) startBatchTriple(s); else startBatchQuad(g, s); - currentGraph = g ; - currentSubject = s ; + currentGraph = g; + currentSubject = s; } } @Override protected final void print(Triple triple) { - Node s = triple.getSubject() ; + Node s = triple.getSubject(); batch(null, s, true); - processTriple(triple) ; + processTriple(triple); } private void startBatchTriple(Node subject) { - batchTriples = new ArrayList<>() ; + batchTriples = new ArrayList<>(); this.currentGraph = null; this.currentSubject = subject; } private void finishBatchTriples(Node subject) { if ( batchTriples != null && !batchTriples.isEmpty() ) { - printBatchTriples(currentSubject, batchTriples) ; - batchTriples.clear() ; + printBatchTriples(currentSubject, batchTriples); + batchTriples.clear(); } } private void processTriple(Triple triple) { - batchTriples.add(triple) ; + batchTriples.add(triple); } @Override protected final void print(Quad quad) { - Node g = quad.getGraph() ; - Node s = quad.getSubject() ; + Node g = quad.getGraph(); + Node s = quad.getSubject(); batch(g, s, false); - processQuad(quad) ; + processQuad(quad); } private void startBatchQuad(Node graph, Node subject) { - batchQuads = new ArrayList<>() ; + batchQuads = new ArrayList<>(); this.currentGraph = graph; this.currentSubject = subject; } private void finishBatchQuad(Node graph, Node subject) { if ( batchQuads != null && !batchQuads.isEmpty() ) { - printBatchQuads(currentGraph, currentSubject, batchQuads) ; - batchQuads.clear() ; + printBatchQuads(currentGraph, currentSubject, batchQuads); + batchQuads.clear(); } } private void processQuad(Quad quad) { - batchQuads.add(quad) ; + batchQuads.add(quad); } - protected abstract void printBatchQuads(Node g, Node s, List<Quad> batch) ; + protected abstract void printBatchQuads(Node g, Node s, List<Quad> batch); + + protected abstract void printBatchTriples(Node s, List<Triple> batch); - protected abstract void printBatchTriples(Node s, List<Triple> batch) ; + protected abstract void finalizeRun(); - protected abstract void finalizeRun() ; - } diff --git a/jena-arq/src/main/java/org/apache/jena/riot/writer/WriterStreamRDFBlocks.java b/jena-arq/src/main/java/org/apache/jena/riot/writer/WriterStreamRDFBlocks.java index f4248a9ab9..d05c61e4b7 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/writer/WriterStreamRDFBlocks.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/writer/WriterStreamRDFBlocks.java @@ -18,16 +18,16 @@ package org.apache.jena.riot.writer; -import java.io.OutputStream ; -import java.io.Writer ; -import java.util.Collection ; -import java.util.List ; +import java.io.OutputStream; +import java.io.Writer; +import java.util.Collection; +import java.util.List; import java.util.Objects; -import org.apache.jena.atlas.io.IndentedWriter ; -import org.apache.jena.graph.Node ; -import org.apache.jena.graph.Triple ; -import org.apache.jena.sparql.core.Quad ; +import org.apache.jena.atlas.io.IndentedWriter; +import org.apache.jena.graph.Node; +import org.apache.jena.graph.Triple; +import org.apache.jena.sparql.core.Quad; import org.apache.jena.sparql.util.Context; import org.apache.jena.system.G; @@ -42,77 +42,77 @@ import org.apache.jena.system.G; public class WriterStreamRDFBlocks extends WriterStreamRDFBatched { - protected static final boolean NL_GDFT_START = WriterConst.NL_GDFT_START ; - protected static final boolean NL_GNMD_START = WriterConst.NL_GNMD_START ; - protected static final boolean NL_GDFT_END = WriterConst.NL_GDFT_END ; - protected static final boolean NL_GNMD_END = WriterConst.NL_GNMD_END ; + protected static final boolean NL_GDFT_START = WriterConst.NL_GDFT_START; + protected static final boolean NL_GNMD_START = WriterConst.NL_GNMD_START; + protected static final boolean NL_GDFT_END = WriterConst.NL_GDFT_END; + protected static final boolean NL_GNMD_END = WriterConst.NL_GNMD_END; // Subject column - normal width - protected static final int INDENT_PREDICATE = WriterConst.INDENT_PREDICATE ; - protected static final int MIN_PREDICATE = 6 ; //WriterConst.MIN_PREDICATE ; - protected static final int LONG_PREDICATE = WriterConst.LONG_PREDICATE ; - protected static final int LONG_SUBJECT = WriterConst.LONG_SUBJECT ; + protected static final int INDENT_PREDICATE = WriterConst.INDENT_PREDICATE; + protected static final int MIN_PREDICATE = 6; //WriterConst.MIN_PREDICATE; + protected static final int LONG_PREDICATE = WriterConst.LONG_PREDICATE; + protected static final int LONG_SUBJECT = WriterConst.LONG_SUBJECT; - protected static final int INDENT_MIN_S = 6 ; // Range of subject indent - protected static final int INDENT_MAX_S = 14 ; - protected static final int GAP_S_P = 2 ; - protected static final int GAP_P_O = 2 ; + protected static final int INDENT_MIN_S = 6; // Range of subject indent + protected static final int INDENT_MAX_S = 14; + protected static final int GAP_S_P = 2; + protected static final int GAP_P_O = 2; - protected static final int INDENT_GDFT = 2 ; // Default graph indent - protected static final int INDENT_GNMD = 4 ; // Named graph indent + protected static final int INDENT_GDFT = 2; // Default graph indent + protected static final int INDENT_GNMD = 4; // Named graph indent // Quad output - protected Node lastGraph = null ; - protected Node lastSubject = null ; + protected Node lastGraph = null; + protected Node lastSubject = null; protected int currentGraphIndent = 0; // Set true if we see a prefix setting for the RDF namespace. protected boolean hasRDFprefix = false; public WriterStreamRDFBlocks(OutputStream output, Context context) { - super(output, context) ; + super(output, context); } public WriterStreamRDFBlocks(Writer output, Context context) { - super(output, context) ; + super(output, context); } public WriterStreamRDFBlocks(IndentedWriter output, Context context) { - super(output, context) ; + super(output, context); } @Override protected void printBatchQuads(Node g, Node s, List<Quad> quads) { if ( g == null ) // print as Triples has currentGraph == null. - g = Quad.defaultGraphNodeGenerated ; + g = Quad.defaultGraphNodeGenerated; if ( Objects.equals(g, lastGraph) ) { // Same graph, different subject. - out.println(" .") ; + out.println(" ."); } else { // Different graph - endGraph(g) ; + endGraph(g); // This does the startBatch. - startGraph(g) ; - lastGraph = g ; + startGraph(g); + lastGraph = g; } - List<Triple> triples = G.quads2triples(quads.iterator()).toList() ; - printBatch(s, triples) ; + List<Triple> triples = G.quads2triples(quads.iterator()).toList(); + printBatch(s, triples); // No trailing "." has been printed. - lastSubject = s ; + lastSubject = s; } @Override protected void printBatchTriples(Node s, List<Triple> triples) { startBatch(); - printBatch(s, triples) ; - out.println(" .") ; + printBatch(s, triples); + out.println(" ."); lastGraph = null; } private void startBatch() { if ( lastGraph != null ) { // last batch was quads - endGraph(null) ; + endGraph(null); lastGraph = null; } else { // last batch was triples. @@ -120,52 +120,52 @@ public class WriterStreamRDFBlocks extends WriterStreamRDFBatched // Any output so far? prefixes or a previous graph. if ( out.getRow() > 1 ) - out.println() ; + out.println(); out.flush(); } private void printBatch(Node s, List<Triple> triples) { - outputNode(s) ; + outputNode(s); if ( out.getCol() > LONG_SUBJECT ) - out.println() ; + out.println(); else - gap(GAP_S_P) ; - out.incIndent(INDENT_PREDICATE) ; - out.pad() ; - writePredicateObjectList(triples) ; - out.decIndent(INDENT_PREDICATE) ; + gap(GAP_S_P); + out.incIndent(INDENT_PREDICATE); + out.pad(); + writePredicateObjectList(triples); + out.decIndent(INDENT_PREDICATE); } private void writePredicateObjectList(Collection<Triple> triples) { // Find width // We may have a prefix for RDF otherwise we use the 'a' abbreviation for rdf:type. - boolean writeKeyWordType = countPrefixesForRDF <= 0 ; - int predicateMaxWidth = Widths.calcWidthTriples(pMap, baseURI, triples, MIN_PREDICATE, LONG_PREDICATE, writeKeyWordType) ; - boolean first = true ; + boolean writeKeyWordType = countPrefixesForRDF <= 0; + int predicateMaxWidth = Widths.calcWidthTriples(pMap, baseURI, triples, MIN_PREDICATE, LONG_PREDICATE, writeKeyWordType); + boolean first = true; for ( Triple triple : triples ) { if ( !first ) - out.println(" ;") ; + out.println(";"); else - first = false ; + first = false; - Node p = triple.getPredicate() ; + Node p = triple.getPredicate(); printProperty(p); - out.pad(predicateMaxWidth) ; - out.print(' ', GAP_P_O) ; - Node o = triple.getObject() ; - outputNode(o) ; + out.pad(predicateMaxWidth); + out.print(' ', GAP_P_O); + Node o = triple.getObject(); + outputNode(o); } } private void gap(int gap) { - out.print(' ', gap) ; + out.print(' ', gap); } @Override protected void finalizeRun() { if ( lastGraph != null ) // last was a quad - endGraph(null) ; + endGraph(null); } @Override @@ -177,65 +177,65 @@ public class WriterStreamRDFBlocks extends WriterStreamRDFBatched out.println(); } - protected boolean dftGraph() { return lastGraph == Quad.defaultGraphNodeGenerated ; } - protected boolean dftGraph(Node g) { return g == Quad.defaultGraphNodeGenerated ; } + protected boolean dftGraph() { return lastGraph == Quad.defaultGraphNodeGenerated; } + protected boolean dftGraph(Node g) { return g == Quad.defaultGraphNodeGenerated; } protected void startGraph(Node g) { startBatch(); // Start graph if ( lastGraph == null ) { - boolean NL_START = (dftGraph(g) ? NL_GDFT_START : NL_GNMD_START) ; + boolean NL_START = (dftGraph(g) ? NL_GDFT_START : NL_GNMD_START); - lastSubject = null ; + lastSubject = null; if ( !dftGraph(g) ) { - outputNode(g) ; - out.print(" ") ; + outputNode(g); + out.print(" "); } if ( NL_START ) - out.println("{") ; + out.println("{"); else - out.print("{ ") ; + out.print("{ "); if ( dftGraph() ) - setGraphIndent(INDENT_GDFT) ; + setGraphIndent(INDENT_GDFT); else { - int x = NL_START ? INDENT_GNMD : out.getCol() ; - setGraphIndent(x) ; + int x = NL_START ? INDENT_GNMD : out.getCol(); + setGraphIndent(x); } - out.incIndent(graphIndent()) ; + out.incIndent(graphIndent()); } - lastGraph = g ; + lastGraph = g; } protected void endGraph(Node g) { if ( lastGraph == null ) - return ; + return; // End of graph if ( !Objects.equals(lastGraph, g) ) { - boolean NL_END = (dftGraph(g) ? NL_GDFT_END : NL_GNMD_END) ; + boolean NL_END = (dftGraph(g) ? NL_GDFT_END : NL_GNMD_END); if ( lastSubject != null ) - out.print(" .") ; + out.print(" ."); if ( NL_END ) { // } on a new line. - out.decIndent(graphIndent()) ; - out.println() ; - out.println("}") ; + out.decIndent(graphIndent()); + out.println(); + out.println("}"); } else { // Possibly on same line as last quad/triple. - out.decIndent(graphIndent()) ; + out.decIndent(graphIndent()); if ( out.atLineStart() ) - out.println("}") ; + out.println("}"); else - out.println(" }") ; + out.println(" }"); } - lastSubject = null ; - lastGraph = null ; + lastSubject = null; + lastGraph = null; } } - protected void setGraphIndent(int x) { currentGraphIndent = x ; } - protected int graphIndent() { return currentGraphIndent ; } + protected void setGraphIndent(int x) { currentGraphIndent = x; } + protected int graphIndent() { return currentGraphIndent; } } diff --git a/jena-arq/src/main/java/org/apache/jena/riot/writer/WriterStreamRDFFlat.java b/jena-arq/src/main/java/org/apache/jena/riot/writer/WriterStreamRDFFlat.java index ed1417edbe..d9146b9d00 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/writer/WriterStreamRDFFlat.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/writer/WriterStreamRDFFlat.java @@ -18,13 +18,13 @@ package org.apache.jena.riot.writer; -import java.io.OutputStream ; +import java.io.OutputStream; import java.io.Writer; -import org.apache.jena.atlas.io.IndentedWriter ; -import org.apache.jena.graph.Node ; -import org.apache.jena.graph.Triple ; -import org.apache.jena.sparql.core.Quad ; +import org.apache.jena.atlas.io.IndentedWriter; +import org.apache.jena.graph.Node; +import org.apache.jena.graph.Triple; +import org.apache.jena.sparql.core.Quad; import org.apache.jena.sparql.util.Context; /** @@ -61,38 +61,38 @@ public class WriterStreamRDFFlat extends WriterStreamRDFBase @Override protected void print(Triple triple) { - Node s = triple.getSubject() ; - Node p = triple.getPredicate() ; - Node o = triple.getObject() ; + Node s = triple.getSubject(); + Node p = triple.getPredicate(); + Node o = triple.getObject(); - outputNode(s) ; - out.print(' ') ; + outputNode(s); + out.print(' '); printProperty(p); - out.print(' ') ; - outputNode(o) ; - out.println(" .") ; + out.print(' '); + outputNode(o); + out.println(" ."); } @Override protected void print(Quad quad) { - Node g = quad.getGraph() ; - Node s = quad.getSubject() ; - Node p = quad.getPredicate() ; - Node o = quad.getObject() ; + Node g = quad.getGraph(); + Node s = quad.getSubject(); + Node p = quad.getPredicate(); + Node o = quad.getObject(); if ( g != null && ! Quad.isDefaultGraph(g) ) { - outputNode(g) ; - out.print(" { ") ; + outputNode(g); + out.print(" { "); } else - out.print("{ ") ; - outputNode(s) ; - out.print(' ') ; + out.print("{ "); + outputNode(s); + out.print(' '); printProperty(p); - out.print(' ') ; - outputNode(o) ; - out.println(" }") ; + out.print(' '); + outputNode(o); + out.println(" }"); } } diff --git a/jena-arq/src/main/java/org/apache/jena/riot/writer/WriterStreamRDFPlain.java b/jena-arq/src/main/java/org/apache/jena/riot/writer/WriterStreamRDFPlain.java index 1e5328bfef..d41e0c3713 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/writer/WriterStreamRDFPlain.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/writer/WriterStreamRDFPlain.java @@ -16,18 +16,18 @@ * limitations under the License. */ -package org.apache.jena.riot.writer ; - -import org.apache.jena.atlas.io.AWriter ; -import org.apache.jena.atlas.io.IO ; -import org.apache.jena.atlas.lib.CharSpace ; -import org.apache.jena.graph.Node ; -import org.apache.jena.graph.Triple ; -import org.apache.jena.riot.out.NodeFormatter ; -import org.apache.jena.riot.out.NodeFormatterNT ; -import org.apache.jena.riot.system.StreamRDF ; -import org.apache.jena.riot.system.StreamRDFLib ; -import org.apache.jena.sparql.core.Quad ; +package org.apache.jena.riot.writer; + +import org.apache.jena.atlas.io.AWriter; +import org.apache.jena.atlas.io.IO; +import org.apache.jena.atlas.lib.CharSpace; +import org.apache.jena.graph.Node; +import org.apache.jena.graph.Triple; +import org.apache.jena.riot.out.NodeFormatter; +import org.apache.jena.riot.out.NodeFormatterNT; +import org.apache.jena.riot.system.StreamRDF; +import org.apache.jena.riot.system.StreamRDFLib; +import org.apache.jena.sparql.core.Quad; /** * An output of triples / quads that is streaming. It writes N-triples/N-quads. @@ -37,15 +37,15 @@ public class WriterStreamRDFPlain implements StreamRDF { // This class is the overall structure - the NodeFormatter controls the // appearance of the Nodes themselves. - protected final AWriter out ; - private final NodeFormatter nodeFmt ; + protected final AWriter out; + private final NodeFormatter nodeFmt; /** * Output tuples, using UTF8 output See {@link StreamRDFLib#writer} for * ways to create a AWriter object. */ public WriterStreamRDFPlain(AWriter w) { - this(w, CharSpace.UTF8) ; + this(w, CharSpace.UTF8); } /** @@ -53,7 +53,7 @@ public class WriterStreamRDFPlain implements StreamRDF { * See {@link StreamRDFLib#writer} for ways to create a AWriter object. */ public WriterStreamRDFPlain(AWriter w, CharSpace charSpace) { - this(w, new NodeFormatterNT(charSpace)) ; + this(w, new NodeFormatterNT(charSpace)); } /** @@ -71,45 +71,45 @@ public class WriterStreamRDFPlain implements StreamRDF { @Override public void finish() { - IO.flush(out) ; + IO.flush(out); } @Override public void triple(Triple triple) { - Node s = triple.getSubject() ; - Node p = triple.getPredicate() ; - Node o = triple.getObject() ; - - format(s) ; - out.print(" ") ; - format(p) ; - out.print(" ") ; - format(o) ; - out.print(" .\n") ; + Node s = triple.getSubject(); + Node p = triple.getPredicate(); + Node o = triple.getObject(); + + format(s); + out.print(" "); + format(p); + out.print(" "); + format(o); + out.print(" .\n"); } @Override public void quad(Quad quad) { - Node s = quad.getSubject() ; - Node p = quad.getPredicate() ; - Node o = quad.getObject() ; - Node g = quad.getGraph() ; + Node s = quad.getSubject(); + Node p = quad.getPredicate(); + Node o = quad.getObject(); + Node g = quad.getGraph(); - format(s) ; - out.print(" ") ; - format(p) ; - out.print(" ") ; - format(o) ; + format(s); + out.print(" "); + format(p); + out.print(" "); + format(o); if ( outputGraphSlot(g) ) { - out.print(" ") ; - format(g) ; + out.print(" "); + format(g); } - out.print(" .\n") ; + out.print(" .\n"); } protected void format(Node n) { - getFmt().format(out, n) ; + getFmt().format(out, n); } @Override @@ -119,6 +119,6 @@ public class WriterStreamRDFPlain implements StreamRDF { public void prefix(String prefix, String iri) {} private static boolean outputGraphSlot(Node g) { - return (g != null && g != Quad.tripleInQuad && !Quad.isDefaultGraph(g)) ; + return (g != null && g != Quad.tripleInQuad && !Quad.isDefaultGraph(g)); } } diff --git a/jena-arq/src/main/java/org/apache/jena/riot/writer/WriterTriX.java b/jena-arq/src/main/java/org/apache/jena/riot/writer/WriterTriX.java index 11bce81327..18d1b10b6d 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/writer/WriterTriX.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/writer/WriterTriX.java @@ -18,22 +18,22 @@ package org.apache.jena.riot.writer; -import java.io.OutputStream ; -import java.io.Writer ; +import java.io.OutputStream; +import java.io.Writer; -import org.apache.jena.atlas.io.IndentedWriter ; -import org.apache.jena.datatypes.xsd.impl.XMLLiteralType ; -import org.apache.jena.graph.Graph ; -import org.apache.jena.riot.Lang ; -import org.apache.jena.riot.WriterDatasetRIOT ; -import org.apache.jena.riot.WriterGraphRIOT ; -import org.apache.jena.riot.lang.ReaderTriX ; -import org.apache.jena.riot.lang.TriX ; -import org.apache.jena.riot.system.PrefixMap ; -import org.apache.jena.riot.system.RiotLib ; -import org.apache.jena.riot.system.StreamRDFOps ; -import org.apache.jena.sparql.core.DatasetGraph ; -import org.apache.jena.sparql.util.Context ; +import org.apache.jena.atlas.io.IndentedWriter; +import org.apache.jena.datatypes.xsd.impl.XMLLiteralType; +import org.apache.jena.graph.Graph; +import org.apache.jena.riot.Lang; +import org.apache.jena.riot.WriterDatasetRIOT; +import org.apache.jena.riot.WriterGraphRIOT; +import org.apache.jena.riot.lang.ReaderTriX; +import org.apache.jena.riot.lang.TriX; +import org.apache.jena.riot.system.PrefixMap; +import org.apache.jena.riot.system.RiotLib; +import org.apache.jena.riot.system.StreamRDFOps; +import org.apache.jena.sparql.core.DatasetGraph; +import org.apache.jena.sparql.util.Context; /** Write TriX. * See {@link TriX} for details. @@ -43,48 +43,48 @@ import org.apache.jena.sparql.util.Context ; * @see StreamWriterTriX */ public class WriterTriX implements WriterDatasetRIOT, WriterGraphRIOT { - private static String rdfXMLLiteral = XMLLiteralType.theXMLLiteralType.getURI() ; + private static String rdfXMLLiteral = XMLLiteralType.theXMLLiteralType.getURI(); // Common pattern. @Override public Lang getLang() { - return Lang.TRIX ; + return Lang.TRIX; } // Dataset @Override public void write(OutputStream out, DatasetGraph datasetGraph, PrefixMap prefixMap, String baseURI, Context context) { - IndentedWriter iOut = new IndentedWriter(out) ; - write(iOut, datasetGraph, prefixMap, baseURI, null) ; + IndentedWriter iOut = new IndentedWriter(out); + write(iOut, datasetGraph, prefixMap, baseURI, null); } @Override public void write(Writer out, DatasetGraph datasetGraph, PrefixMap prefixMap, String baseURI, Context context) { - IndentedWriter iOut = RiotLib.create(out) ; - write(iOut, datasetGraph, prefixMap, baseURI, null) ; + IndentedWriter iOut = RiotLib.create(out); + write(iOut, datasetGraph, prefixMap, baseURI, null); } private void write(IndentedWriter out, DatasetGraph datasetGraph, PrefixMap prefixMap, String baseURI, Context context) { - StreamWriterTriX w = new StreamWriterTriX(out, prefixMap) ; - StreamRDFOps.datasetToStream(datasetGraph, w) ; + StreamWriterTriX w = new StreamWriterTriX(out, prefixMap); + StreamRDFOps.datasetToStream(datasetGraph, w); } // Graph @Override public void write(OutputStream out, Graph graph, PrefixMap prefixMap, String baseURI, Context context) { - IndentedWriter iOut = new IndentedWriter(out) ; - write(iOut, graph, prefixMap, baseURI, null) ; + IndentedWriter iOut = new IndentedWriter(out); + write(iOut, graph, prefixMap, baseURI, null); } @Override public void write(Writer out, Graph graph, PrefixMap prefixMap, String baseURI, Context context) { - IndentedWriter iOut = RiotLib.create(out) ; - write(iOut, graph, prefixMap, baseURI, null) ; + IndentedWriter iOut = RiotLib.create(out); + write(iOut, graph, prefixMap, baseURI, null); } private static void write(IndentedWriter out, Graph graph, PrefixMap prefixMap, String baseURI, Object context) { - StreamWriterTriX w = new StreamWriterTriX(out, prefixMap) ; - StreamRDFOps.graphToStream(graph, w) ; + StreamWriterTriX w = new StreamWriterTriX(out, prefixMap); + StreamRDFOps.graphToStream(graph, w); } }
