Clean-up
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/out/NodeFmtLib.java b/jena-arq/src/main/java/org/apache/jena/riot/out/NodeFmtLib.java
index ecc1393..cb0fca6 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/out/NodeFmtLib.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/out/NodeFmtLib.java
@@ -40,17 +40,17 @@
* <p>
* Methods <tt>str</tt> generate a reparsable string.
* <p>
- * Methods <tt>displayStr</tt> do not guarantee a reparsable string
- * e.g. may use abbreviations or common prefixes.
+ * Methods <tt>displayStr</tt> do not guarantee a reparsable string
+ * e.g. may use abbreviations or common prefixes.
*/
public class NodeFmtLib
{
// Replaces FmtUtils
// See OutputLangUtils.
// See and use EscapeStr
-
+
private static final NodeFormatter plainFormatter = new NodeFormatterNT();
-
+
private static PrefixMap dftPrefixMap = PrefixMapFactory.create();
static {
PrefixMapping pm = ARQConstants.getGlobalPrefixMap();
@@ -105,9 +105,9 @@
private static String displayStrNodes(Node...nodes) {
StringJoiner sj = new StringJoiner(" ");
- for ( Node n : nodes )
+ for ( Node n : nodes )
sj.add(displayStr(n));
- return sj.toString();
+ return sj.toString();
}
public static void str(IndentedWriter w, Node n) {
@@ -118,6 +118,10 @@
return str(n, prologue.getBaseURI(), prologue.getPrefixMap());
}
+ public static String str(Node n, PrefixMap prefixMap) {
+ return str(n, null, prefixMap);
+ }
+
public static String str(Node n, String base, PrefixMap prefixMap) {
IndentedLineBuffer sw = new IndentedLineBuffer();
serialize(sw, n, base, prefixMap);
@@ -136,21 +140,21 @@
formatter = new NodeFormatterTTL(base, prefixMap);
formatter.format(w, n);
}
-
+
// ---- Blank node labels.
-
+
// Strict N-triples only allows [A-Za-z][A-Za-z0-9]
static char encodeMarkerChar = 'X';
- // These two form a pair to convert bNode labels to a safe (i.e. legal N-triples form) and back agains.
-
+ // These two form a pair to convert bNode labels to a safe (i.e. legal N-triples form) and back agains.
+
// Encoding is:
- // 1 - Add a Letter
+ // 1 - Add a Letter
// 2 - Hexify, as Xnn, anything outside ASCII A-Za-z0-9
// 3 - X is encoded as XX
-
- private static char LabelLeadingLetter = 'B';
-
+
+ private static char LabelLeadingLetter = 'B';
+
public static String encodeBNodeLabel(String label) {
StringBuilder buff = new StringBuilder();
// Must be at least one char and not a digit.
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/SSE_Parser.java b/jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/SSE_Parser.java
index 6eeca0f..5a1f71e 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/SSE_Parser.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/SSE_Parser.java
@@ -29,47 +29,35 @@
public class SSE_Parser
{
- public static void term(Reader reader, ParseHandler handler)
- {
- SSE_ParserCore p = new SSE_ParserCore(reader) ;
- p.setHandler(handler) ;
- try
- {
- p.term() ;
- // Checks for EOF
-// //<EOF> test : EOF is always token 0.
-// if ( p.token_source.getNextToken().kind != 0 )
-// throw new SSEParseException("Trailing characters after "+item, item.getLine(), item.getColumn()) ;
- }
- catch (ParseException ex)
- { throw new SSEParseException(ex.getMessage(), ex.currentToken.beginLine, ex.currentToken.beginColumn) ; }
- catch (TokenMgrError tErr)
- {
- // Last valid token : not the same as token error message - but this should not happen
- int col = p.token.endColumn ;
- int line = p.token.endLine ;
- throw new SSEParseException(tErr.getMessage(), line, col) ;
- }
- //catch (JenaException ex) { throw new TurtleParseException(ex.getMessage(), ex) ; }
+ @FunctionalInterface
+ private interface ParserEntry { void entry(SSE_ParserCore parser) throws ParseException; }
+
+ public static void term(Reader reader, ParseHandler handler) {
+ parse$(reader, handler, SSE_ParserCore::term);
}
- public static void parse(Reader reader, ParseHandler handler)
- {
+ public static void parse(Reader reader, ParseHandler handler) {
+ parse$(reader, handler, SSE_ParserCore::parse);
+ }
+
+ private static void parse$(Reader reader, ParseHandler handler, ParserEntry parserStep) {
SSE_ParserCore p = new SSE_ParserCore(reader) ;
p.setHandler(handler) ;
- try
+ try {
+ parserStep.entry(p);
+// Token tok = p.token_source.getNextToken();
+// if ( tok.kind != 0 )
+// throw new SSEParseException("Trailing characters at "+tok, tok.beginLine, tok.beginColumn) ;
+ }
+ catch (ParseException ex)
+ { throw new SSEParseException(ex.getMessage(), ex.currentToken.beginLine, ex.currentToken.beginColumn) ; }
+ catch (TokenMgrError tErr)
{
- p.parse() ;
- }
- catch (ParseException ex)
- { throw new SSEParseException(ex.getMessage(), ex.currentToken.beginLine, ex.currentToken.beginColumn) ; }
- catch (TokenMgrError tErr)
- {
- // Last valid token : not the same as token error message - but this should not happen
- int col = p.token.endColumn ;
- int line = p.token.endLine ;
- throw new SSEParseException(tErr.getMessage(), line, col) ;
- }
- //catch (JenaException ex) { throw new TurtleParseException(ex.getMessage(), ex) ; }
+ // Last valid token : not the same as token error message - but this should not happen
+ int col = p.token.endColumn ;
+ int line = p.token.endLine ;
+ throw new SSEParseException(tErr.getMessage(), line, col) ;
+ }
}
+
}
diff --git a/jena-text/src/main/java/org/apache/jena/query/text/TextIndexTDB1.java b/jena-text/src/main/java/org/apache/jena/query/text/TextIndexTDB1.java
index f713826..f7c6a3d 100644
--- a/jena-text/src/main/java/org/apache/jena/query/text/TextIndexTDB1.java
+++ b/jena-text/src/main/java/org/apache/jena/query/text/TextIndexTDB1.java
@@ -18,7 +18,6 @@
package org.apache.jena.query.text;
-import org.apache.jena.query.text.TextIndex;
import org.apache.jena.tdb.transaction.Transaction;
import org.apache.jena.tdb.transaction.TransactionLifecycle;
@@ -56,5 +55,4 @@
@Override
public void clearupCommitted(Transaction txn) {}
-
}
