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 3e6fdb498fda9ea667c7f1e5fb13e53bb5a42966 Author: Andy Seaborne <[email protected]> AuthorDate: Thu Nov 21 09:18:03 2024 +0000 Reformat code --- .../src/main/java/arq/cmdline/ModAlgebra.java | 59 +++-- jena-cmds/src/main/java/arq/cmdline/ModItem.java | 56 +++-- .../src/main/java/arq/cmdline/ModQueryIn.java | 123 +++++----- jena-cmds/src/main/java/arq/qexpr.java | 247 ++++++++++----------- jena-cmds/src/main/java/arq/rupdate.java | 72 +++--- 5 files changed, 254 insertions(+), 303 deletions(-) diff --git a/jena-cmds/src/main/java/arq/cmdline/ModAlgebra.java b/jena-cmds/src/main/java/arq/cmdline/ModAlgebra.java index baa0087fb8..8eb205e667 100644 --- a/jena-cmds/src/main/java/arq/cmdline/ModAlgebra.java +++ b/jena-cmds/src/main/java/arq/cmdline/ModAlgebra.java @@ -23,59 +23,50 @@ import org.apache.jena.cmd.ArgDecl; import org.apache.jena.cmd.CmdArgModule; import org.apache.jena.cmd.CmdGeneral; import org.apache.jena.cmd.ModBase; -import org.apache.jena.sparql.algebra.Op ; -import org.apache.jena.sparql.sse.SSE ; +import org.apache.jena.sparql.algebra.Op; +import org.apache.jena.sparql.sse.SSE; -public class ModAlgebra extends ModBase -{ - protected final ArgDecl queryFileDecl = new ArgDecl(ArgDecl.HasValue, "query", "file") ; +public class ModAlgebra extends ModBase { + protected final ArgDecl queryFileDecl = new ArgDecl(ArgDecl.HasValue, "query", "file"); - private String queryFilename = null ; - private String queryString = null ; - private Op op = null ; + private String queryFilename = null; + private String queryString = null; + private Op op = null; @Override - public void registerWith(CmdGeneral cmdLine) - { - cmdLine.getUsage().startCategory("Query") ; - cmdLine.add(queryFileDecl, - "--query, --file", - "File containing an algebra query") ; + public void registerWith(CmdGeneral cmdLine) { + cmdLine.getUsage().startCategory("Query"); + cmdLine.add(queryFileDecl, "--query, --file", "File containing an algebra query"); } @Override - public void processArgs(CmdArgModule cmdLine) - { - if ( cmdLine.contains(queryFileDecl) ) - { - queryFilename = cmdLine.getValue(queryFileDecl) ; - queryString = IO.readWholeFileAsUTF8(queryFilename) ; + public void processArgs(CmdArgModule cmdLine) { + if ( cmdLine.contains(queryFileDecl) ) { + queryFilename = cmdLine.getValue(queryFileDecl); + queryString = IO.readWholeFileAsUTF8(queryFilename); } if ( cmdLine.getNumPositional() == 0 && queryFilename == null ) - cmdLine.cmdError("No query string or query file") ; + cmdLine.cmdError("No query string or query file"); if ( cmdLine.getNumPositional() > 1 ) - cmdLine.cmdError("Only one query string allowed") ; + cmdLine.cmdError("Only one query string allowed"); if ( cmdLine.getNumPositional() == 1 && queryFilename != null ) - cmdLine.cmdError("Either query string or query file - not both") ; + cmdLine.cmdError("Either query string or query file - not both"); - - if ( queryFilename == null ) - { - String qs = cmdLine.getPositionalArg(0) ; - queryString = cmdLine.indirect(qs) ; + if ( queryFilename == null ) { + String qs = cmdLine.getPositionalArg(0); + queryString = cmdLine.indirect(qs); } } - public Op getOp() - { + public Op getOp() { if ( op != null ) - return op ; - op = SSE.parseOp(queryString) ; + return op; + op = SSE.parseOp(queryString); if ( op == null ) - System.err.println("Failed to parse : "+queryString) ; - return op ; + System.err.println("Failed to parse : " + queryString); + return op; } } diff --git a/jena-cmds/src/main/java/arq/cmdline/ModItem.java b/jena-cmds/src/main/java/arq/cmdline/ModItem.java index c357046305..c16f67e19e 100644 --- a/jena-cmds/src/main/java/arq/cmdline/ModItem.java +++ b/jena-cmds/src/main/java/arq/cmdline/ModItem.java @@ -23,57 +23,51 @@ import org.apache.jena.cmd.ArgDecl; import org.apache.jena.cmd.CmdArgModule; import org.apache.jena.cmd.CmdGeneral; import org.apache.jena.cmd.ModBase; -import org.apache.jena.sparql.sse.Item ; -import org.apache.jena.sparql.sse.SSE ; +import org.apache.jena.sparql.sse.Item; +import org.apache.jena.sparql.sse.SSE; -public class ModItem extends ModBase -{ - protected final ArgDecl queryFileDecl = new ArgDecl(ArgDecl.HasValue, "file") ; +public class ModItem extends ModBase { + protected final ArgDecl queryFileDecl = new ArgDecl(ArgDecl.HasValue, "file"); - private String filename = null ; - private String parseString = null ; - private Item item = null ; + private String filename = null; + private String parseString = null; + private Item item = null; @Override - public void registerWith(CmdGeneral cmdLine) - { - cmdLine.getUsage().startCategory("Item") ; - cmdLine.add(queryFileDecl, "--file=", "File") ; + public void registerWith(CmdGeneral cmdLine) { + cmdLine.getUsage().startCategory("Item"); + cmdLine.add(queryFileDecl, "--file=", "File"); } @Override - public void processArgs(CmdArgModule cmdLine) - { - if ( cmdLine.contains(queryFileDecl) ) - { - filename = cmdLine.getValue(queryFileDecl) ; - parseString = IO.readWholeFileAsUTF8(filename) ; - return ; + public void processArgs(CmdArgModule cmdLine) { + if ( cmdLine.contains(queryFileDecl) ) { + filename = cmdLine.getValue(queryFileDecl); + parseString = IO.readWholeFileAsUTF8(filename); + return; } if ( cmdLine.getNumPositional() == 0 && filename == null ) - cmdLine.cmdError("No query string or query file") ; + cmdLine.cmdError("No query string or query file"); if ( cmdLine.getNumPositional() > 1 ) - cmdLine.cmdError("Only one query string allowed") ; + cmdLine.cmdError("Only one query string allowed"); if ( cmdLine.getNumPositional() == 1 && filename != null ) - cmdLine.cmdError("Either query string or query file - not both") ; + cmdLine.cmdError("Either query string or query file - not both"); - if ( filename == null ) - { - String qs = cmdLine.getPositionalArg(0) ; - parseString = cmdLine.indirect(qs) ; + if ( filename == null ) { + String qs = cmdLine.getPositionalArg(0); + parseString = cmdLine.indirect(qs); } } - public Item getItem() - { + public Item getItem() { if ( item != null ) - return item ; + return item; // Need to get the (outer) prologue. - item = SSE.parseItem(parseString) ; - return item ; + item = SSE.parseItem(parseString); + return item; } } diff --git a/jena-cmds/src/main/java/arq/cmdline/ModQueryIn.java b/jena-cmds/src/main/java/arq/cmdline/ModQueryIn.java index 712a4d92fa..c866c91f54 100644 --- a/jena-cmds/src/main/java/arq/cmdline/ModQueryIn.java +++ b/jena-cmds/src/main/java/arq/cmdline/ModQueryIn.java @@ -16,99 +16,99 @@ * limitations under the License. */ -package arq.cmdline ; +package arq.cmdline; -import java.io.IOException ; +import java.io.IOException; import org.apache.jena.cmd.*; -import org.apache.jena.query.Query ; -import org.apache.jena.query.QueryFactory ; -import org.apache.jena.query.Syntax ; -import org.apache.jena.shared.JenaException ; +import org.apache.jena.query.Query; +import org.apache.jena.query.QueryFactory; +import org.apache.jena.query.Syntax; +import org.apache.jena.shared.JenaException; import org.apache.jena.shared.NotFoundException; -import org.apache.jena.sparql.ARQInternalErrorException ; -import org.apache.jena.util.FileUtils ; +import org.apache.jena.sparql.ARQInternalErrorException; +import org.apache.jena.util.FileUtils; public class ModQueryIn extends ModBase { - protected final ArgDecl queryFileDecl = new ArgDecl(ArgDecl.HasValue, "query", "file") ; - protected final ArgDecl querySyntaxDecl = new ArgDecl(ArgDecl.HasValue, "syntax", "syn", "in") ; - protected final ArgDecl queryBaseDecl = new ArgDecl(ArgDecl.HasValue, "base") ; + protected final ArgDecl queryFileDecl = new ArgDecl(ArgDecl.HasValue, "query", "file"); + protected final ArgDecl querySyntaxDecl = new ArgDecl(ArgDecl.HasValue, "syntax", "syn", "in"); + protected final ArgDecl queryBaseDecl = new ArgDecl(ArgDecl.HasValue, "base"); - private Syntax defaultQuerySyntax = Syntax.syntaxARQ ; - private Syntax querySyntax = null ; - private String queryFilename = null ; - private String queryString = null ; - private Query query = null ; - private String baseURI = null ; + private Syntax defaultQuerySyntax = Syntax.syntaxARQ; + private Syntax querySyntax = null; + private String queryFilename = null; + private String queryString = null; + private Query query = null; + private String baseURI = null; public ModQueryIn(Syntax defaultSyntax) { - defaultQuerySyntax = defaultSyntax ; - querySyntax = defaultSyntax ; + defaultQuerySyntax = defaultSyntax; + querySyntax = defaultSyntax; } @Override public void registerWith(CmdGeneral cmdLine) { - cmdLine.getUsage().startCategory("Query") ; - cmdLine.add(queryFileDecl, "--query, --file", "File containing a query") ; - cmdLine.add(querySyntaxDecl, "--syntax, --in", "Syntax of the query") ; - cmdLine.add(queryBaseDecl, "--base", "Base URI for the query") ; + cmdLine.getUsage().startCategory("Query"); + cmdLine.add(queryFileDecl, "--query, --file", "File containing a query"); + cmdLine.add(querySyntaxDecl, "--syntax, --in", "Syntax of the query"); + cmdLine.add(queryBaseDecl, "--base", "Base URI for the query"); } @Override public void processArgs(CmdArgModule cmdline) throws IllegalArgumentException { if ( cmdline.contains(queryBaseDecl) ) - baseURI = cmdline.getValue(queryBaseDecl) ; + baseURI = cmdline.getValue(queryBaseDecl); if ( cmdline.contains(queryFileDecl) ) { - queryFilename = cmdline.getValue(queryFileDecl) ; - querySyntax = Syntax.guessQueryFileSyntax(queryFilename, defaultQuerySyntax) ; + queryFilename = cmdline.getValue(queryFileDecl); + querySyntax = Syntax.guessQueryFileSyntax(queryFilename, defaultQuerySyntax); } if ( cmdline.getNumPositional() == 0 && queryFilename == null ) - cmdline.cmdError("No query string or query file") ; + cmdline.cmdError("No query string or query file"); if ( cmdline.getNumPositional() > 1 ) - cmdline.cmdError("Only one query string allowed") ; + cmdline.cmdError("Only one query string allowed"); if ( cmdline.getNumPositional() == 1 && queryFilename != null ) - cmdline.cmdError("Either query string or query file - not both") ; + cmdline.cmdError("Either query string or query file - not both"); if ( queryFilename == null ) { // One positional argument. - String qs = cmdline.getPositionalArg(0) ; + String qs = cmdline.getPositionalArg(0); if ( cmdline.matchesIndirect(qs) ) - querySyntax = Syntax.guessQueryFileSyntax(qs, defaultQuerySyntax) ; + querySyntax = Syntax.guessQueryFileSyntax(qs, defaultQuerySyntax); - queryString = cmdline.indirect(qs) ; + queryString = cmdline.indirect(qs); } // Set syntax if ( cmdline.contains(querySyntaxDecl) ) { // short name - String s = cmdline.getValue(querySyntaxDecl) ; - Syntax syn = Syntax.lookup(s) ; + String s = cmdline.getValue(querySyntaxDecl); + Syntax syn = Syntax.lookup(s); if ( syn == null ) - cmdline.cmdError("Unrecognized syntax: " + s) ; - querySyntax = syn ; + cmdline.cmdError("Unrecognized syntax: " + s); + querySyntax = syn; } } public Syntax getQuerySyntax() { - return querySyntax ; + return querySyntax; } public Query getQuery() { if ( query != null ) - return query ; + return query; if ( queryFilename != null && queryString != null ) { - System.err.println("Both query string and query file name given") ; - throw new TerminationException(1) ; + System.err.println("Both query string and query file name given"); + throw new TerminationException(1); } if ( queryFilename == null && queryString == null ) { - System.err.println("No query string and no query file name given") ; - throw new TerminationException(1) ; + System.err.println("No query string and no query file name given"); + throw new TerminationException(1); } try { @@ -116,40 +116,39 @@ public class ModQueryIn extends ModBase { if ( queryFilename.equals("-") ) { try { // Stderr? - queryString = FileUtils.readWholeFileAsUTF8(System.in) ; + queryString = FileUtils.readWholeFileAsUTF8(System.in); // And drop into next if } catch (IOException ex) { - throw new CmdException("Error reading stdin", ex) ; + throw new CmdException("Error reading stdin", ex); } } else { try { - query = QueryFactory.read(queryFilename, baseURI, getQuerySyntax()) ; - return query ; + query = QueryFactory.read(queryFilename, baseURI, getQuerySyntax()); + return query; } catch (NotFoundException ex) { - throw new JenaException("Failed to load Query: "+ex.getMessage()); + throw new JenaException("Failed to load Query: " + ex.getMessage()); } } } - query = QueryFactory.create(queryString, baseURI, getQuerySyntax()) ; - return query ; + query = QueryFactory.create(queryString, baseURI, getQuerySyntax()); + return query; } catch (ARQInternalErrorException intEx) { - System.err.println(intEx.getMessage()) ; + System.err.println(intEx.getMessage()); if ( intEx.getCause() != null ) { - System.err.println("Cause:") ; - intEx.getCause().printStackTrace(System.err) ; - System.err.println() ; + System.err.println("Cause:"); + intEx.getCause().printStackTrace(System.err); + System.err.println(); } - intEx.printStackTrace(System.err) ; - throw new TerminationException(99) ; - } - catch (JenaException ex) { - System.err.println(ex.getMessage()) ; - throw new TerminationException(2) ; + intEx.printStackTrace(System.err); + throw new TerminationException(99); + } catch (JenaException ex) { + System.err.println(ex.getMessage()); + throw new TerminationException(2); } catch (Exception ex) { - System.out.flush() ; - ex.printStackTrace(System.err) ; - throw new TerminationException(98) ; + System.out.flush(); + ex.printStackTrace(System.err); + throw new TerminationException(98); } } } diff --git a/jena-cmds/src/main/java/arq/qexpr.java b/jena-cmds/src/main/java/arq/qexpr.java index 5b66138a23..74bde00486 100644 --- a/jena-cmds/src/main/java/arq/qexpr.java +++ b/jena-cmds/src/main/java/arq/qexpr.java @@ -18,215 +18,194 @@ package arq; -import org.apache.jena.Jena ; -import org.apache.jena.atlas.io.IndentedWriter ; -import org.apache.jena.atlas.logging.LogCtl ; +import org.apache.jena.Jena; +import org.apache.jena.atlas.io.IndentedWriter; +import org.apache.jena.atlas.logging.LogCtl; import org.apache.jena.cmd.ArgDecl; import org.apache.jena.cmd.CmdException; import org.apache.jena.cmd.CmdLineArgs; import org.apache.jena.cmd.TerminationException; -import org.apache.jena.graph.Node ; -import org.apache.jena.query.ARQ ; -import org.apache.jena.query.QueryParseException ; -import org.apache.jena.riot.out.NodeFmtLib ; -import org.apache.jena.shared.PrefixMapping ; -import org.apache.jena.sparql.ARQConstants ; -import org.apache.jena.sparql.core.Prologue ; -import org.apache.jena.sparql.engine.ExecutionContext ; -import org.apache.jena.sparql.expr.Expr ; -import org.apache.jena.sparql.expr.ExprEvalException ; -import org.apache.jena.sparql.expr.ExprLib ; -import org.apache.jena.sparql.expr.NodeValue ; -import org.apache.jena.sparql.function.FunctionEnv ; -import org.apache.jena.sparql.sse.WriterSSE ; -import org.apache.jena.sparql.util.ExprUtils ; -import org.apache.jena.sparql.util.NodeFactoryExtra ; -import org.apache.jena.sys.JenaSystem ; +import org.apache.jena.graph.Node; +import org.apache.jena.query.ARQ; +import org.apache.jena.query.QueryParseException; +import org.apache.jena.riot.out.NodeFmtLib; +import org.apache.jena.shared.PrefixMapping; +import org.apache.jena.sparql.ARQConstants; +import org.apache.jena.sparql.core.Prologue; +import org.apache.jena.sparql.engine.ExecutionContext; +import org.apache.jena.sparql.expr.Expr; +import org.apache.jena.sparql.expr.ExprEvalException; +import org.apache.jena.sparql.expr.ExprLib; +import org.apache.jena.sparql.expr.NodeValue; +import org.apache.jena.sparql.function.FunctionEnv; +import org.apache.jena.sparql.sse.WriterSSE; +import org.apache.jena.sparql.util.ExprUtils; +import org.apache.jena.sparql.util.NodeFactoryExtra; +import org.apache.jena.sys.JenaSystem; /** A program to execute expressions from the command line. */ -public class qexpr -{ +public class qexpr { static { - LogCtl.setLogging() ; - JenaSystem.init() ; + LogCtl.setLogging(); + JenaSystem.init(); } - public static void main (String... argv) - { + public static void main(String...argv) { try { - main2(argv) ; - } - catch (TerminationException ex) { System.exit(ex.getCode()) ; } - catch (CmdException ex) - { - System.err.println(ex.getMessage()) ; + main2(argv); + } catch (TerminationException ex) { + System.exit(ex.getCode()); + } catch (CmdException ex) { + System.err.println(ex.getMessage()); if ( ex.getCause() != null ) - ex.getCause().printStackTrace(System.err) ; + ex.getCause().printStackTrace(System.err); } } - public static void execAndReturn(String... argv) - { + public static void execAndReturn(String...argv) { try { - main2(argv) ; - } - catch (TerminationException ex) { return ; } - catch (CmdException ex) - { - System.err.println(ex.getMessage()) ; + main2(argv); + } catch (TerminationException ex) { + return; + } catch (CmdException ex) { + System.err.println(ex.getMessage()); if ( ex.getCause() != null ) - ex.getCause().printStackTrace(System.err) ; + ex.getCause().printStackTrace(System.err); } } - public static void main2(String... argv) - { + public static void main2(String...argv) { - CmdLineArgs cl = new CmdLineArgs(argv) ; + CmdLineArgs cl = new CmdLineArgs(argv); - ArgDecl helpDecl = new ArgDecl(ArgDecl.NoValue, "h", "help") ; - cl.add(helpDecl) ; + ArgDecl helpDecl = new ArgDecl(ArgDecl.NoValue, "h", "help"); + cl.add(helpDecl); - ArgDecl verboseDecl = new ArgDecl(ArgDecl.NoValue, "v", "verbose") ; - cl.add(verboseDecl) ; + ArgDecl verboseDecl = new ArgDecl(ArgDecl.NoValue, "v", "verbose"); + cl.add(verboseDecl); - ArgDecl versionDecl = new ArgDecl(ArgDecl.NoValue, "ver", "version", "V") ; - cl.add(versionDecl) ; + ArgDecl versionDecl = new ArgDecl(ArgDecl.NoValue, "ver", "version", "V"); + cl.add(versionDecl); - ArgDecl quietDecl = new ArgDecl(ArgDecl.NoValue, "q", "quiet") ; - cl.add(quietDecl) ; + ArgDecl quietDecl = new ArgDecl(ArgDecl.NoValue, "q", "quiet"); + cl.add(quietDecl); - ArgDecl reduceDecl = new ArgDecl(ArgDecl.NoValue, "reduce", "fold", "simplify" ) ; - cl.add(reduceDecl) ; + ArgDecl reduceDecl = new ArgDecl(ArgDecl.NoValue, "reduce", "fold", "simplify"); + cl.add(reduceDecl); - ArgDecl strictDecl = new ArgDecl(ArgDecl.NoValue, "strict") ; - cl.add(strictDecl) ; + ArgDecl strictDecl = new ArgDecl(ArgDecl.NoValue, "strict"); + cl.add(strictDecl); - ArgDecl printDecl = new ArgDecl(ArgDecl.HasValue, "print") ; - cl.add(printDecl) ; + ArgDecl printDecl = new ArgDecl(ArgDecl.HasValue, "print"); + cl.add(printDecl); try { - cl.process() ; - } catch (IllegalArgumentException ex) - { - System.err.println(ex.getMessage()) ; - usage(System.err) ; - throw new CmdException() ; + cl.process(); + } catch (IllegalArgumentException ex) { + System.err.println(ex.getMessage()); + usage(System.err); + throw new CmdException(); } - if ( cl.contains(helpDecl) ) - { - usage() ; - throw new TerminationException(0) ; + if ( cl.contains(helpDecl) ) { + usage(); + throw new TerminationException(0); } - if ( cl.contains(versionDecl) ) - { - System.out.println("ARQ Version: "+ARQ.VERSION+" (Jena: "+Jena.VERSION+")") ; - throw new TerminationException(0) ; + if ( cl.contains(versionDecl) ) { + System.out.println("ARQ Version: " + ARQ.VERSION + " (Jena: " + Jena.VERSION + ")"); + throw new TerminationException(0); } // ==== General things - boolean verbose = cl.contains(verboseDecl) ; - boolean quiet = cl.contains(quietDecl) ; + boolean verbose = cl.contains(verboseDecl); + boolean quiet = cl.contains(quietDecl); if ( cl.contains(strictDecl) ) - ARQ.setStrictMode() ; + ARQ.setStrictMode(); - boolean actionCopySubstitute = cl.contains(reduceDecl) ; - boolean actionPrintPrefix = false ; - boolean actionPrintSPARQL = false ; - boolean actionPrint = cl.contains(printDecl) ; + boolean actionCopySubstitute = cl.contains(reduceDecl); + boolean actionPrintPrefix = false; + boolean actionPrintSPARQL = false; + boolean actionPrint = cl.contains(printDecl); - for ( String v : cl.getValues( printDecl ) ) - { - if ( v.equalsIgnoreCase( "prefix" ) || v.equalsIgnoreCase( "op" ) ) - { + for ( String v : cl.getValues(printDecl) ) { + if ( v.equalsIgnoreCase("prefix") || v.equalsIgnoreCase("op") ) { actionPrintPrefix = true; - } - else if ( v.equalsIgnoreCase( "expr" ) ) - { + } else if ( v.equalsIgnoreCase("expr") ) { actionPrintSPARQL = true; - } - else - { - System.err.println( "Unknown print form: " + v ); - throw new TerminationException( 0 ); + } else { + System.err.println("Unknown print form: " + v); + throw new TerminationException(0); } } // ==== Do it - for ( int i = 0 ; i < cl.getNumPositional() ; i++ ) - { - String exprStr = cl.getPositionalArg(i) ; - exprStr = cl.indirect(exprStr) ; + for ( int i = 0 ; i < cl.getNumPositional() ; i++ ) { + String exprStr = cl.getPositionalArg(i); + exprStr = cl.indirect(exprStr); try { - PrefixMapping pmap = PrefixMapping.Factory.create() ; - pmap.setNsPrefixes(ARQConstants.getGlobalPrefixMap()) ; - pmap.setNsPrefix("", "http://example/";) ; - pmap.setNsPrefix("ex", "http://example/ns#";) ; + PrefixMapping pmap = PrefixMapping.Factory.create(); + pmap.setNsPrefixes(ARQConstants.getGlobalPrefixMap()); + pmap.setNsPrefix("", "http://example/";); + pmap.setNsPrefix("ex", "http://example/ns#";); - Expr expr = ExprUtils.parse(exprStr, pmap) ; - if ( actionPrint ) - { - IndentedWriter iOut = IndentedWriter.stdout; + Expr expr = ExprUtils.parse(exprStr, pmap); + if ( actionPrint ) { + IndentedWriter iOut = IndentedWriter.stdout; if ( actionPrintSPARQL ) { ExprUtils.fmtSPARQL(iOut, expr); iOut.ensureStartOfLine(); } if ( actionPrintPrefix ) { - WriterSSE.out(iOut, expr, new Prologue(pmap)) ; + WriterSSE.out(iOut, expr, new Prologue(pmap)); iOut.ensureStartOfLine(); } iOut.flush(); - continue ; + continue; } if ( verbose ) - System.out.print(expr.toString()+" => ") ; + System.out.print(expr.toString() + " => "); try { - if ( actionCopySubstitute ) - { - Expr e = ExprLib.foldConstants(expr) ; - System.out.println(e) ; - } - else - { + if ( actionCopySubstitute ) { + Expr e = ExprLib.foldConstants(expr); + System.out.println(e); + } else { // Default action - ARQ.getContext().set(ARQConstants.sysCurrentTime, NodeFactoryExtra.nowAsDateTime()) ; - FunctionEnv env = new ExecutionContext(ARQ.getContext(), null, null, null) ; - NodeValue r = expr.eval(null, env) ; - //System.out.println(r.asQuotedString()) ; - Node n = r.asNode() ; - String s = NodeFmtLib.displayStr(n) ; - System.out.println(s) ; + ARQ.getContext().set(ARQConstants.sysCurrentTime, NodeFactoryExtra.nowAsDateTime()); + FunctionEnv env = new ExecutionContext(ARQ.getContext(), null, null, null); + NodeValue r = expr.eval(null, env); + // System.out.println(r.asQuotedString()) ; + Node n = r.asNode(); + String s = NodeFmtLib.displayStr(n); + System.out.println(s); } - } catch (ExprEvalException ex) - { + } catch (ExprEvalException ex) { ex.printStackTrace(); - System.out.println("Exception: "+ex.getMessage()) ; - throw new TerminationException(2) ; + System.out.println("Exception: " + ex.getMessage()); + throw new TerminationException(2); } - } catch (QueryParseException ex) - { - System.err.println("Parse error: "+ex.getMessage()) ; - throw new TerminationException(2) ; + } catch (QueryParseException ex) { + System.err.println("Parse error: " + ex.getMessage()); + throw new TerminationException(2); } } } - static void usage() { usage(System.out) ; } + static void usage() { + usage(System.out); + } - static void usage(java.io.PrintStream out) - { - out.println("Usage: [--print=[prefix|expr]] expression") ; + static void usage(java.io.PrintStream out) { + out.println("Usage: [--print=[prefix|expr]] expression"); } - } +} diff --git a/jena-cmds/src/main/java/arq/rupdate.java b/jena-cmds/src/main/java/arq/rupdate.java index 92139a2740..3888ef4066 100644 --- a/jena-cmds/src/main/java/arq/rupdate.java +++ b/jena-cmds/src/main/java/arq/rupdate.java @@ -18,75 +18,63 @@ package arq; -import java.util.List ; +import java.util.List; import org.apache.jena.cmd.ArgDecl; import org.apache.jena.cmd.CmdException; import org.apache.jena.update.*; -import arq.cmdline.CmdARQ ; -import arq.cmdline.ModRemote ; +import arq.cmdline.CmdARQ; +import arq.cmdline.ModRemote; -public class rupdate extends CmdARQ -{ - static final ArgDecl updateArg = new ArgDecl(ArgDecl.HasValue, "update", "file") ; +public class rupdate extends CmdARQ { + static final ArgDecl updateArg = new ArgDecl(ArgDecl.HasValue, "update", "file"); - protected ModRemote modRemote = new ModRemote() ; + protected ModRemote modRemote = new ModRemote(); - List<String> requestFiles = null ; + List<String> requestFiles = null; - public static void main(String... argv) - { - new rupdate(argv).mainRun() ; + public static void main(String...argv) { + new rupdate(argv).mainRun(); } - protected rupdate(String[] argv) - { - super(argv) ; - super.add(updateArg, "--update=FILE", "Update commands to execute") ; - super.addModule(modRemote) ; + protected rupdate(String[] argv) { + super(argv); + super.add(updateArg, "--update=FILE", "Update commands to execute"); + super.addModule(modRemote); } @Override - protected void processModulesAndArgs() - { - requestFiles = getValues(updateArg) ; // ???? - super.processModulesAndArgs() ; + protected void processModulesAndArgs() { + requestFiles = getValues(updateArg); // ???? + super.processModulesAndArgs(); } - @Override - protected String getSummary() - { - return getCommandName()+" --service=URL --update=<request file>" ; + protected String getSummary() { + return getCommandName() + " --service=URL --update=<request file>"; } @Override - protected void exec() - { - if ( modRemote.getServiceURL() == null ) - { - throw new CmdException("No endpoint given") ; + protected void exec() { + if ( modRemote.getServiceURL() == null ) { + throw new CmdException("No endpoint given"); } - String endpoint = modRemote.getServiceURL() ; + String endpoint = modRemote.getServiceURL(); - for ( String filename : requestFiles ) - { - UpdateRequest req = UpdateFactory.read( filename ); - exec( endpoint, req ); + for ( String filename : requestFiles ) { + UpdateRequest req = UpdateFactory.read(filename); + exec(endpoint, req); } - for ( String requestString : super.getPositional() ) - { - requestString = indirect( requestString ); - UpdateRequest req = UpdateFactory.create( requestString ); - exec( endpoint, req ); + for ( String requestString : super.getPositional() ) { + requestString = indirect(requestString); + UpdateRequest req = UpdateFactory.create(requestString); + exec(endpoint, req); } } - private void exec(String endpoint, UpdateRequest req) - { + private void exec(String endpoint, UpdateRequest req) { UpdateExecution.service(endpoint).update(req).execute(); } } -
