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
The following commit(s) were added to refs/heads/main by this push:
new 64fae92907 Reformat code (jena-cmds:arq/)
64fae92907 is described below
commit 64fae92907d7aa3236b51226015a66e29da6bad6
Author: Andy Seaborne <[email protected]>
AuthorDate: Wed Mar 4 19:24:46 2026 +0000
Reformat code (jena-cmds:arq/)
---
jena-cmds/src/main/java/arq/arq.java | 8 +-
jena-cmds/src/main/java/arq/bindings.java | 22 +-
.../src/main/java/arq/cmdline/CmdARQ_SSE.java | 23 +--
jena-cmds/src/main/java/arq/cmdline/CmdUpdate.java | 30 +--
.../src/main/java/arq/cmdline/ModAssembler.java | 38 ++--
.../src/main/java/arq/cmdline/ModContext.java | 18 +-
.../src/main/java/arq/cmdline/ModDataset.java | 22 +-
.../main/java/arq/cmdline/ModDatasetAssembler.java | 44 ++--
.../main/java/arq/cmdline/ModDatasetGeneral.java | 50 ++---
.../arq/cmdline/ModDatasetGeneralAssembler.java | 18 +-
jena-cmds/src/main/java/arq/cmdline/ModEngine.java | 18 +-
jena-cmds/src/main/java/arq/cmdline/ModFormat.java | 77 +++----
.../src/main/java/arq/cmdline/ModLangOutput.java | 22 +-
.../src/main/java/arq/cmdline/ModQueryOut.java | 48 ++---
jena-cmds/src/main/java/arq/cmdline/ModRemote.java | 22 +-
.../src/main/java/arq/cmdline/ModResultsIn.java | 78 +++----
.../src/main/java/arq/cmdline/ModResultsOut.java | 10 +-
jena-cmds/src/main/java/arq/cmdline/ModTime.java | 28 +--
jena-cmds/src/main/java/arq/qexpr.java | 4 +-
jena-cmds/src/main/java/arq/qparse.java | 8 +-
jena-cmds/src/main/java/arq/query.java | 225 +++++++++++----------
jena-cmds/src/main/java/arq/rsparql.java | 22 +-
jena-cmds/src/main/java/arq/sparql.java | 8 +-
jena-cmds/src/main/java/arq/sse.java | 82 ++++----
jena-cmds/src/main/java/arq/sse_exec.java | 18 +-
jena-cmds/src/main/java/arq/sse_query.java | 132 ++++++------
jena-cmds/src/main/java/arq/uparse.java | 116 +++++------
jena-cmds/src/main/java/arq/utf8.java | 2 +-
jena-cmds/src/main/java/arq/wwwdec.java | 10 +-
jena-cmds/src/main/java/arq/wwwenc.java | 18 +-
30 files changed, 599 insertions(+), 622 deletions(-)
diff --git a/jena-cmds/src/main/java/arq/arq.java
b/jena-cmds/src/main/java/arq/arq.java
index 0951724606..fdfa65f4fe 100644
--- a/jena-cmds/src/main/java/arq/arq.java
+++ b/jena-cmds/src/main/java/arq/arq.java
@@ -21,20 +21,20 @@
package arq;
-import org.apache.jena.query.Syntax ;
+import org.apache.jena.query.Syntax;
/** A program to execute queries from the command line in ARQ mode. */
public class arq extends query
{
public static void main (String... argv) {
- new arq(argv).mainRun() ;
+ new arq(argv).mainRun();
}
public arq(String[] argv) {
- super(argv) ;
+ super(argv);
}
@Override
- protected Syntax getDefaultSyntax() { return Syntax.syntaxARQ ; }
+ protected Syntax getDefaultSyntax() { return Syntax.syntaxARQ; }
}
diff --git a/jena-cmds/src/main/java/arq/bindings.java
b/jena-cmds/src/main/java/arq/bindings.java
index f7b4f5a83f..343a09d1b6 100644
--- a/jena-cmds/src/main/java/arq/bindings.java
+++ b/jena-cmds/src/main/java/arq/bindings.java
@@ -21,25 +21,25 @@
package arq;
-import java.io.InputStream ;
-import java.io.OutputStream ;
+import java.io.InputStream;
+import java.io.OutputStream;
-import org.apache.jena.sparql.engine.binding.BindingInputStream ;
-import org.apache.jena.sparql.engine.binding.BindingOutputStream ;
+import org.apache.jena.sparql.engine.binding.BindingInputStream;
+import org.apache.jena.sparql.engine.binding.BindingOutputStream;
/** Simple command for testing bindings */
public class bindings
{
public static void main(String... args)
{
- InputStream in = System.in ;
- OutputStream out = System.out ;
+ InputStream in = System.in;
+ OutputStream out = System.out;
- BindingInputStream input = new BindingInputStream(in) ;
- BindingOutputStream output = new BindingOutputStream(out) ;
+ BindingInputStream input = new BindingInputStream(in);
+ BindingOutputStream output = new BindingOutputStream(out);
- for ( ; input.hasNext() ; )
- output.send(input.next()) ;
- output.flush() ;
+ for (; input.hasNext(); )
+ output.send(input.next());
+ output.flush();
}
}
diff --git a/jena-cmds/src/main/java/arq/cmdline/CmdARQ_SSE.java
b/jena-cmds/src/main/java/arq/cmdline/CmdARQ_SSE.java
index bdc9047c43..fd27b8b8bd 100644
--- a/jena-cmds/src/main/java/arq/cmdline/CmdARQ_SSE.java
+++ b/jena-cmds/src/main/java/arq/cmdline/CmdARQ_SSE.java
@@ -21,17 +21,15 @@
package arq.cmdline;
-import org.apache.jena.sparql.sse.Item ;
+import org.apache.jena.sparql.sse.Item;
/** Root of read an SSE file and do something */
-public abstract class CmdARQ_SSE extends CmdARQ
-{
- protected ModItem modItem = new ModItem() ;
+public abstract class CmdARQ_SSE extends CmdARQ {
+ protected ModItem modItem = new ModItem();
- public CmdARQ_SSE(String[] argv)
- {
- super(argv) ;
- super.addModule(modItem) ;
+ public CmdARQ_SSE(String[] argv) {
+ super(argv);
+ super.addModule(modItem);
}
@Override
@@ -40,11 +38,10 @@ public abstract class CmdARQ_SSE extends CmdARQ
}
@Override
- final protected void exec()
- {
- Item item = modItem.getItem() ;
- exec(item) ;
+ final protected void exec() {
+ Item item = modItem.getItem();
+ exec(item);
}
- protected abstract void exec(Item item) ;
+ protected abstract void exec(Item item);
}
diff --git a/jena-cmds/src/main/java/arq/cmdline/CmdUpdate.java
b/jena-cmds/src/main/java/arq/cmdline/CmdUpdate.java
index b76eda0dd3..9c44b7632f 100644
--- a/jena-cmds/src/main/java/arq/cmdline/CmdUpdate.java
+++ b/jena-cmds/src/main/java/arq/cmdline/CmdUpdate.java
@@ -21,42 +21,42 @@
package arq.cmdline;
-import org.apache.jena.query.Syntax ;
-import org.apache.jena.sparql.core.DatasetGraph ;
+import org.apache.jena.query.Syntax;
+import org.apache.jena.sparql.core.DatasetGraph;
public abstract class CmdUpdate extends CmdARQ
{
- protected ModDataset modDataset = null ;
- protected Syntax updateSyntax = Syntax.syntaxARQ ;
+ protected ModDataset modDataset = null;
+ protected Syntax updateSyntax = Syntax.syntaxARQ;
protected CmdUpdate(String[] argv)
{
- super(argv) ;
- modDataset = setModDataset() ;
- addModule(modDataset) ;
+ super(argv);
+ modDataset = setModDataset();
+ addModule(modDataset);
}
protected ModDataset setModDataset() {
- return new ModDatasetGeneralAssembler() ;
+ return new ModDatasetGeneralAssembler();
}
@Override
protected void processModulesAndArgs()
{
- super.processModulesAndArgs() ;
+ super.processModulesAndArgs();
if ( super.cmdStrictMode )
- updateSyntax = Syntax.syntaxSPARQL_11 ;
+ updateSyntax = Syntax.syntaxSPARQL_11;
}
@Override
protected final void exec() {
- DatasetGraph dataset = modDataset.getDatasetGraph() ;
+ DatasetGraph dataset = modDataset.getDatasetGraph();
if ( dataset == null )
- dataset = dealWithNoDataset() ;
- execUpdate(dataset) ;
+ dataset = dealWithNoDataset();
+ execUpdate(dataset);
}
- protected abstract DatasetGraph dealWithNoDataset() ;
+ protected abstract DatasetGraph dealWithNoDataset();
- protected abstract void execUpdate(DatasetGraph graphStore) ;
+ protected abstract void execUpdate(DatasetGraph graphStore);
}
diff --git a/jena-cmds/src/main/java/arq/cmdline/ModAssembler.java
b/jena-cmds/src/main/java/arq/cmdline/ModAssembler.java
index 273898d2c0..7488f94781 100644
--- a/jena-cmds/src/main/java/arq/cmdline/ModAssembler.java
+++ b/jena-cmds/src/main/java/arq/cmdline/ModAssembler.java
@@ -22,24 +22,24 @@
package arq.cmdline;
import org.apache.jena.cmd.*;
-import org.apache.jena.rdf.model.Resource ;
-import org.apache.jena.shared.JenaException ;
-import org.apache.jena.shared.NotFoundException ;
-import org.apache.jena.sparql.ARQException ;
-import org.apache.jena.sparql.core.assembler.AssemblerUtils ;
+import org.apache.jena.rdf.model.Resource;
+import org.apache.jena.shared.JenaException;
+import org.apache.jena.shared.NotFoundException;
+import org.apache.jena.sparql.ARQException;
+import org.apache.jena.sparql.core.assembler.AssemblerUtils;
public class ModAssembler extends ModBase
{
- public static final ArgDecl assemblerDescDecl = new
ArgDecl(ArgDecl.HasValue, "desc", "dataset") ;
+ public static final ArgDecl assemblerDescDecl = new
ArgDecl(ArgDecl.HasValue, "desc", "dataset");
- private String assemblerFile = null ;
- Object thingDescribed = null ;
+ private String assemblerFile = null;
+ Object thingDescribed = null;
public ModAssembler()
{
// Wire in assembler implementations
- AssemblerUtils.init() ;
+ AssemblerUtils.init();
}
// Dataset : default graph and named graphs
@@ -48,36 +48,36 @@ public class ModAssembler extends ModBase
public void processArgs(CmdArgModule cmdLine)
{
if ( cmdLine.contains(assemblerDescDecl) )
- assemblerFile = cmdLine.getValue(assemblerDescDecl) ;
+ assemblerFile = cmdLine.getValue(assemblerDescDecl);
}
@Override
public void registerWith(CmdGeneral cmdLine)
{
- //cmdLine.getUsage().startCategory("Dataset") ;
+ //cmdLine.getUsage().startCategory("Dataset");
cmdLine.add(assemblerDescDecl,
"--desc=",
- "Assembler description file") ;
+ "Assembler description file");
}
- public String getAssemblerFile() { return assemblerFile ; }
+ public String getAssemblerFile() { return assemblerFile; }
// Should subclass and apply typing.
public Object create(Resource type)
{
- Object thing = null ;
+ Object thing = null;
try {
- thing = AssemblerUtils.build(assemblerFile, type) ;
+ thing = AssemblerUtils.build(assemblerFile, type);
}
catch (ARQException ex) { throw ex; }
catch (NotFoundException ex)
- { throw new CmdException("Not found: "+ex.getMessage()) ; }
+ { throw new CmdException("Not found: "+ex.getMessage()); }
catch (JenaException ex)
- { throw ex ; }
+ { throw ex; }
catch (Exception ex)
- { throw new CmdException("Error creating", ex) ; }
+ { throw new CmdException("Error creating", ex); }
- return thing ;
+ return thing;
}
}
diff --git a/jena-cmds/src/main/java/arq/cmdline/ModContext.java
b/jena-cmds/src/main/java/arq/cmdline/ModContext.java
index 415abfd2d1..0a05777cf7 100644
--- a/jena-cmds/src/main/java/arq/cmdline/ModContext.java
+++ b/jena-cmds/src/main/java/arq/cmdline/ModContext.java
@@ -21,27 +21,27 @@
package arq.cmdline;
-import java.io.PrintStream ;
+import java.io.PrintStream;
-import org.apache.jena.atlas.io.IndentedWriter ;
+import org.apache.jena.atlas.io.IndentedWriter;
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.query.ARQ ;
-import org.apache.jena.sparql.util.Context ;
-import org.apache.jena.sparql.util.MappingRegistry ;
-import org.apache.jena.sparql.util.Symbol ;
-import org.apache.jena.sys.JenaSystem ;
+import org.apache.jena.query.ARQ;
+import org.apache.jena.sparql.util.Context;
+import org.apache.jena.sparql.util.MappingRegistry;
+import org.apache.jena.sparql.util.Symbol;
+import org.apache.jena.sys.JenaSystem;
/** Set Context items */
public class ModContext extends ModBase
{
static { JenaSystem.init(); }
- protected final ArgDecl setDecl = new ArgDecl(ArgDecl.HasValue, "set",
"define", "defn", "def") ;
+ protected final ArgDecl setDecl = new ArgDecl(ArgDecl.HasValue, "set",
"define", "defn", "def");
- private Context context = new Context() ;
+ private Context context = new Context();
public ModContext() {}
diff --git a/jena-cmds/src/main/java/arq/cmdline/ModDataset.java
b/jena-cmds/src/main/java/arq/cmdline/ModDataset.java
index c74788b703..43f7d4fc39 100644
--- a/jena-cmds/src/main/java/arq/cmdline/ModDataset.java
+++ b/jena-cmds/src/main/java/arq/cmdline/ModDataset.java
@@ -22,30 +22,30 @@
package arq.cmdline;
import org.apache.jena.cmd.ModBase;
-import org.apache.jena.query.Dataset ;
-import org.apache.jena.sparql.core.DatasetGraph ;
+import org.apache.jena.query.Dataset;
+import org.apache.jena.sparql.core.DatasetGraph;
public abstract class ModDataset extends ModBase
{
- protected boolean createAttempted = false ;
- protected Dataset dataset = null ;
+ protected boolean createAttempted = false;
+ protected Dataset dataset = null;
public ModDataset() {}
final
public Dataset getDataset() {
if ( ! createAttempted )
- dataset = createDataset() ;
- createAttempted = true ;
- return dataset ;
+ dataset = createDataset();
+ createAttempted = true;
+ return dataset;
}
public DatasetGraph getDatasetGraph() {
- Dataset ds = getDataset() ;
+ Dataset ds = getDataset();
if ( ds == null )
- return null ;
- return ds.asDatasetGraph() ;
+ return null;
+ return ds.asDatasetGraph();
}
- public abstract Dataset createDataset() ;
+ public abstract Dataset createDataset();
}
diff --git a/jena-cmds/src/main/java/arq/cmdline/ModDatasetAssembler.java
b/jena-cmds/src/main/java/arq/cmdline/ModDatasetAssembler.java
index a7b36ad103..52f34e07f9 100644
--- a/jena-cmds/src/main/java/arq/cmdline/ModDatasetAssembler.java
+++ b/jena-cmds/src/main/java/arq/cmdline/ModDatasetAssembler.java
@@ -24,35 +24,35 @@ package arq.cmdline;
import org.apache.jena.cmd.CmdArgModule;
import org.apache.jena.cmd.CmdException;
import org.apache.jena.cmd.CmdGeneral;
-import org.apache.jena.query.Dataset ;
-import org.apache.jena.shared.JenaException ;
-import org.apache.jena.shared.NotFoundException ;
-import org.apache.jena.sparql.ARQException ;
-import org.apache.jena.sparql.core.assembler.DatasetAssemblerVocab ;
+import org.apache.jena.query.Dataset;
+import org.apache.jena.shared.JenaException;
+import org.apache.jena.shared.NotFoundException;
+import org.apache.jena.sparql.ARQException;
+import org.apache.jena.sparql.core.assembler.DatasetAssemblerVocab;
/** Add assembler to a general dataset description */
-public class ModDatasetAssembler extends ModDataset
-{
- private ModAssembler modAssembler = new ModAssembler() ;
+public class ModDatasetAssembler extends ModDataset {
+ private ModAssembler modAssembler = new ModAssembler();
@Override
public Dataset createDataset() {
if ( modAssembler.getAssemblerFile() == null )
- return null ;
-
+ return null;
+
try {
- dataset =
(Dataset)modAssembler.create(DatasetAssemblerVocab.tDataset) ;
+ dataset =
(Dataset)modAssembler.create(DatasetAssemblerVocab.tDataset);
if ( dataset == null )
- throw new CmdException("No dataset description found in:
"+modAssembler.getAssemblerFile()) ;
+ throw new CmdException("No dataset description found in: " +
modAssembler.getAssemblerFile());
+ } catch (CmdException | ARQException ex) {
+ throw ex;
+ } catch (NotFoundException ex) {
+ throw new CmdException("Not found: " + ex.getMessage());
+ } catch (JenaException ex) {
+ throw ex;
+ } catch (Exception ex) {
+ throw new CmdException("Error creating dataset", ex);
}
- catch (CmdException | ARQException ex) { throw ex ; }
- catch (NotFoundException ex)
- { throw new CmdException("Not found: "+ex.getMessage()) ; }
- catch (JenaException ex)
- { throw ex ; }
- catch (Exception ex)
- { throw new CmdException("Error creating dataset", ex) ; }
- return dataset ;
+ return dataset;
}
@Override
@@ -64,8 +64,8 @@ public class ModDatasetAssembler extends ModDataset
public void processArgs(CmdArgModule cmdLine) {
modAssembler.processArgs(cmdLine);
}
-
+
public String getAssemblerFile() {
- return modAssembler.getAssemblerFile() ;
+ return modAssembler.getAssemblerFile();
}
}
diff --git a/jena-cmds/src/main/java/arq/cmdline/ModDatasetGeneral.java
b/jena-cmds/src/main/java/arq/cmdline/ModDatasetGeneral.java
index 1600f9d9cc..b5a17f1afe 100644
--- a/jena-cmds/src/main/java/arq/cmdline/ModDatasetGeneral.java
+++ b/jena-cmds/src/main/java/arq/cmdline/ModDatasetGeneral.java
@@ -21,18 +21,18 @@
package arq.cmdline;
-import java.util.List ;
+import java.util.List;
import org.apache.jena.atlas.lib.IRILib;
import org.apache.jena.cmd.ArgDecl;
import org.apache.jena.cmd.CmdArgModule;
import org.apache.jena.cmd.CmdException;
import org.apache.jena.cmd.CmdGeneral;
-import org.apache.jena.query.Dataset ;
-import org.apache.jena.query.DatasetFactory ;
-import org.apache.jena.riot.RDFDataMgr ;
-import org.apache.jena.shared.JenaException ;
-import org.apache.jena.sparql.util.DatasetUtils ;
+import org.apache.jena.query.Dataset;
+import org.apache.jena.query.DatasetFactory;
+import org.apache.jena.riot.RDFDataMgr;
+import org.apache.jena.shared.JenaException;
+import org.apache.jena.sparql.util.DatasetUtils;
import org.apache.jena.system.Txn;
/** ModDataset: arguments to build a dataset -
@@ -42,24 +42,24 @@ import org.apache.jena.system.Txn;
public class ModDatasetGeneral extends ModDataset
{
// See also ModDatasetAssembler
- protected final ArgDecl graphDecl = new ArgDecl(ArgDecl.HasValue,
"graph") ;
- protected final ArgDecl dataDecl = new ArgDecl(ArgDecl.HasValue,
"data") ;
- protected final ArgDecl namedGraphDecl = new ArgDecl(ArgDecl.HasValue,
"named", "namedgraph", "namedGraph", "namedData", "nameddata") ;
+ protected final ArgDecl graphDecl = new ArgDecl(ArgDecl.HasValue,
"graph");
+ protected final ArgDecl dataDecl = new ArgDecl(ArgDecl.HasValue,
"data");
+ protected final ArgDecl namedGraphDecl = new ArgDecl(ArgDecl.HasValue,
"named", "namedgraph", "namedGraph", "namedData", "nameddata");
- private List<String> dataURLs = null ;
- private List<String> graphURLs = null ;
- private List<String> namedGraphURLs = null ;
+ private List<String> dataURLs = null;
+ private List<String> graphURLs = null;
+ private List<String> namedGraphURLs = null;
protected ModDatasetGeneral() {}
@Override
public void registerWith(CmdGeneral cl) {
- cl.getUsage().startCategory("Dataset") ;
+ cl.getUsage().startCategory("Dataset");
cl.add(dataDecl,
"--data=FILE",
- "Data for the dataset - triple or quad formats. --data can be
used for multiple times in the same command. FILE can be a URL (http/https)") ;
+ "Data for the dataset - triple or quad formats. --data can be
used for multiple times in the same command. FILE can be a URL (http/https)");
cl.add(graphDecl,
"--graph=FILE",
- "Graph for default graph of the dataset. FILE can be a URL
(http/https)") ;
+ "Graph for default graph of the dataset. FILE can be a URL
(http/https)");
cl.add(namedGraphDecl,
"--namedGraph=FILE",
"Add a graph into the dataset as a named graph. --namedGraph
can be used multiple times in the same command. FILE in this case can only be
a file, not a URL. It will be called <FILE> even if a local path of
/data/sub1/FILE");
@@ -78,18 +78,18 @@ public class ModDatasetGeneral extends ModDataset
if ( (dataURLs == null || dataURLs.size() == 0) &&
(graphURLs == null || graphURLs.size() == 0) &&
(namedGraphURLs == null || namedGraphURLs.size() == 0) )
- return null ;
+ return null;
- Dataset ds = DatasetFactory.createTxnMem() ;
- addGraphs(ds) ;
- dataset = ds ;
- return dataset ;
+ Dataset ds = DatasetFactory.createTxnMem();
+ addGraphs(ds);
+ dataset = ds;
+ return dataset;
}
static <X> boolean hasEntries(List<X> list) {
if ( list == null )
- return false ;
- return ! list.isEmpty() ;
+ return false;
+ return ! list.isEmpty();
}
protected void addGraphs(Dataset ds) {
@@ -108,13 +108,13 @@ public class ModDatasetGeneral extends ModDataset
if ( hasEntries(graphURLs) || hasEntries(namedGraphURLs) ) {
// Resolve named graph URLs so the graphname is an absolute
IRI.
List<String> x =
namedGraphURLs.stream().map(IRILib::filenameToIRI).toList();
- DatasetUtils.addInGraphs(ds, graphURLs, x, null) ;
+ DatasetUtils.addInGraphs(ds, graphURLs, x, null);
}
}
catch (JenaException ex)
- { throw ex ; }
+ { throw ex; }
catch (Exception ex)
- { throw new CmdException("Error creating dataset", ex) ; }
+ { throw new CmdException("Error creating dataset", ex); }
}
public List<String> getGraphURLs() {
diff --git
a/jena-cmds/src/main/java/arq/cmdline/ModDatasetGeneralAssembler.java
b/jena-cmds/src/main/java/arq/cmdline/ModDatasetGeneralAssembler.java
index 4076275a0a..1ab08aafbd 100644
--- a/jena-cmds/src/main/java/arq/cmdline/ModDatasetGeneralAssembler.java
+++ b/jena-cmds/src/main/java/arq/cmdline/ModDatasetGeneralAssembler.java
@@ -23,36 +23,36 @@ package arq.cmdline;
import org.apache.jena.cmd.CmdArgModule;
import org.apache.jena.cmd.CmdGeneral;
-import org.apache.jena.query.Dataset ;
+import org.apache.jena.query.Dataset;
/** Add assembler to a general dataset description */
public class ModDatasetGeneralAssembler extends ModDatasetGeneral
{
public ModDatasetGeneralAssembler() {}
- private ModDatasetAssembler modAssembler = new ModDatasetAssembler() ;
+ private ModDatasetAssembler modAssembler = new ModDatasetAssembler();
@Override
public Dataset createDataset()
{
- Dataset ds = modAssembler.createDataset() ;
+ Dataset ds = modAssembler.createDataset();
if ( ds == null )
- ds = super.createDataset() ;
- return ds ;
+ ds = super.createDataset();
+ return ds;
}
@Override
public void registerWith(CmdGeneral cmdLine)
{
- modAssembler.registerWith(cmdLine) ;
- super.registerWith(cmdLine) ;
+ modAssembler.registerWith(cmdLine);
+ super.registerWith(cmdLine);
}
@Override
public void processArgs(CmdArgModule cmdLine)
{
- modAssembler.processArgs(cmdLine) ;
- super.processArgs(cmdLine) ;
+ modAssembler.processArgs(cmdLine);
+ super.processArgs(cmdLine);
}
}
diff --git a/jena-cmds/src/main/java/arq/cmdline/ModEngine.java
b/jena-cmds/src/main/java/arq/cmdline/ModEngine.java
index 2b2b527f02..09a6c66d76 100644
--- a/jena-cmds/src/main/java/arq/cmdline/ModEngine.java
+++ b/jena-cmds/src/main/java/arq/cmdline/ModEngine.java
@@ -21,13 +21,13 @@
package arq.cmdline;
-import java.util.List ;
+import java.util.List;
import org.apache.jena.cmd.*;
-import org.apache.jena.sparql.engine.main.QueryEngineMain ;
-import org.apache.jena.sparql.engine.main.QueryEngineMainQuad ;
-import org.apache.jena.sparql.engine.ref.QueryEngineRef ;
-import org.apache.jena.sparql.engine.ref.QueryEngineRefQuad ;
+import org.apache.jena.sparql.engine.main.QueryEngineMain;
+import org.apache.jena.sparql.engine.main.QueryEngineMainQuad;
+import org.apache.jena.sparql.engine.ref.QueryEngineRef;
+import org.apache.jena.sparql.engine.ref.QueryEngineRefQuad;
public class ModEngine extends ModBase
@@ -36,15 +36,15 @@ public class ModEngine extends ModBase
// Alters the ARQ environment but provides nothing at execution time.
// Combine with ModSymbol?
- protected final ArgDecl engineDecl = new ArgDecl(ArgDecl.HasValue,
"engine") ;
+ protected final ArgDecl engineDecl = new ArgDecl(ArgDecl.HasValue,
"engine");
protected final ArgDecl unEngineDecl = new ArgDecl(ArgDecl.HasValue,
"unengine",
"unEngine",
"removeEngine",
"removeengine"
- ) ;
+ );
- private boolean timing = false ;
+ private boolean timing = false;
public ModEngine() {}
@@ -67,7 +67,7 @@ public class ModEngine extends ModBase
List<String> engineDecls = cmdLine.getValues(engineDecl);
// if ( x.size() > 0 )
- // QueryEngineRegistry.get().factories().clear() ;
+ // QueryEngineRegistry.get().factories().clear();
for ( String engineName : engineDecls ) {
switch (engineName.toLowerCase()) {
diff --git a/jena-cmds/src/main/java/arq/cmdline/ModFormat.java
b/jena-cmds/src/main/java/arq/cmdline/ModFormat.java
index 70dfb9273f..5162f99779 100644
--- a/jena-cmds/src/main/java/arq/cmdline/ModFormat.java
+++ b/jena-cmds/src/main/java/arq/cmdline/ModFormat.java
@@ -21,7 +21,6 @@
package arq.cmdline;
-
import java.util.Arrays;
import java.util.List;
@@ -30,65 +29,47 @@ import org.apache.jena.cmd.CmdArgModule;
import org.apache.jena.cmd.CmdGeneral;
import org.apache.jena.cmd.ModBase;
-public class ModFormat extends ModBase
-{
- protected final
- ArgDecl resultsFmtDecl = new ArgDecl(ArgDecl.HasValue, "fmt", "format") ;
+public class ModFormat extends ModBase {
+ protected final ArgDecl resultsFmtDecl = new ArgDecl(ArgDecl.HasValue,
"fmt", "format");
+
+ private String format = "N-TRIPLES";
- private String format = "N-TRIPLES" ;
-
public ModFormat() {}
-
+
@Override
- public void processArgs(CmdArgModule cmdline) throws
IllegalArgumentException
- {
- if ( cmdline.contains(resultsFmtDecl) )
- {
- String rFmt = cmdline.getValue(resultsFmtDecl) ;
- format = lookup(rFmt) ;
+ public void processArgs(CmdArgModule cmdline) throws
IllegalArgumentException {
+ if ( cmdline.contains(resultsFmtDecl) ) {
+ String rFmt = cmdline.getValue(resultsFmtDecl);
+ format = lookup(rFmt);
if ( format == null )
- cmdline.cmdError("Unrecognized format: "+rFmt) ;
+ cmdline.cmdError("Unrecognized format: " + rFmt);
}
}
-
+
@Override
- public void registerWith(CmdGeneral cmdLine)
- {
- cmdLine.getUsage().startCategory("Output format") ;
- cmdLine.add(resultsFmtDecl,
- "--format",
- "Format (Result sets: text, XML, JSON; Graph: RDF
serialization)") ;
+ public void registerWith(CmdGeneral cmdLine) {
+ cmdLine.getUsage().startCategory("Output format");
+ cmdLine.add(resultsFmtDecl, "--format", "Format (Result sets: text,
XML, JSON; Graph: RDF serialization)");
}
- public void checkCommandLine(CmdArgModule cmdLine)
- {}
+ public void checkCommandLine(CmdArgModule cmdLine) {}
- public String getFormat() { return format ; }
-
- public String getFormat(String defaultFormat)
- {
+ public String getFormat() {
+ return format;
+ }
+
+ public String getFormat(String defaultFormat) {
if ( format == null )
- return defaultFormat ;
- return format ;
+ return defaultFormat;
+ return format;
}
-
- private String lookup(String fmt)
- {
- return
formats.stream().filter(fmt::equalsIgnoreCase).findFirst().orElse("TURTLE");
+
+ private String lookup(String fmt) {
+ return
formats.stream().filter(fmt::equalsIgnoreCase).findFirst().orElse("TURTLE");
}
- static final List<String> formats = Arrays.asList(
- "RDF/XML",
- "RDF/XML-ABBREV",
- "N-TRIPLE",
- "N-TRIPLES",
- "N3",
- "N3-PP" ,
- "N3-PLAIN" ,
- "N3-TRIPLES" ,
- "N3-TRIPLE" ,
- "TURTLE" ,
- //"Turtle" ,
- "TTL"
- ) ;
+ static final List<String> formats = Arrays.asList("RDF/XML",
"RDF/XML-ABBREV", "N-TRIPLE", "N-TRIPLES", "N3", "N3-PP", "N3-PLAIN",
+ "N3-TRIPLES",
"N3-TRIPLE", "TURTLE",
+ // "Turtle" ,
+ "TTL");
}
diff --git a/jena-cmds/src/main/java/arq/cmdline/ModLangOutput.java
b/jena-cmds/src/main/java/arq/cmdline/ModLangOutput.java
index 7911bda326..5ec1c77969 100644
--- a/jena-cmds/src/main/java/arq/cmdline/ModLangOutput.java
+++ b/jena-cmds/src/main/java/arq/cmdline/ModLangOutput.java
@@ -54,18 +54,16 @@ public class ModLangOutput extends ModBase
@Override
public void processArgs(CmdArgModule cmdLine) {
- {
- int x = 0;
- if ( cmdLine.contains(argPretty) )
- x++;
- if ( cmdLine.contains(argStream) )
- x++;
- if ( cmdLine.contains(argOutput) )
- x++;
-
- if ( x >= 2 )
- throw new CmdException("Multiple output choices given: Use one
of --stream, --output and --formatted/--pretty");
- }
+ int x = 0;
+ if ( cmdLine.contains(argPretty) )
+ x++;
+ if ( cmdLine.contains(argStream) )
+ x++;
+ if ( cmdLine.contains(argOutput) )
+ x++;
+
+ if ( x >= 2 )
+ throw new CmdException("Multiple output choices given: Use one of
--stream, --output and --formatted/--pretty");
if ( cmdLine.contains(argPretty) ) {
String langName = cmdLine.getValue(argPretty);
diff --git a/jena-cmds/src/main/java/arq/cmdline/ModQueryOut.java
b/jena-cmds/src/main/java/arq/cmdline/ModQueryOut.java
index 7ae64dd399..1fbc9e19bd 100644
--- a/jena-cmds/src/main/java/arq/cmdline/ModQueryOut.java
+++ b/jena-cmds/src/main/java/arq/cmdline/ModQueryOut.java
@@ -22,29 +22,29 @@
package arq.cmdline;
-import org.apache.jena.atlas.io.IndentedWriter ;
+import org.apache.jena.atlas.io.IndentedWriter;
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.query.Query ;
-import org.apache.jena.query.Syntax ;
-import org.apache.jena.sparql.util.QueryOutputUtils ;
+import org.apache.jena.query.Query;
+import org.apache.jena.query.Syntax;
+import org.apache.jena.sparql.util.QueryOutputUtils;
public class ModQueryOut extends ModBase
{
- protected final ArgDecl queryOutputSyntaxDecl = new
ArgDecl(ArgDecl.HasValue, "out", "format") ;
- protected final ArgDecl queryNumberDecl = new
ArgDecl(ArgDecl.NoValue, "num", "number") ;
+ protected final ArgDecl queryOutputSyntaxDecl = new
ArgDecl(ArgDecl.HasValue, "out", "format");
+ protected final ArgDecl queryNumberDecl = new
ArgDecl(ArgDecl.NoValue, "num", "number");
- private Syntax outputSyntax = Syntax.syntaxSPARQL ;
- private boolean lineNumbers = false ;
+ private Syntax outputSyntax = Syntax.syntaxSPARQL;
+ private boolean lineNumbers = false;
@Override
public void registerWith(CmdGeneral cmdLine)
{
- cmdLine.getUsage().startCategory("Output") ;
- cmdLine.add(queryOutputSyntaxDecl, "--out, --format", "Output
syntax") ;
- cmdLine.add(queryNumberDecl, "--num", "Print line numbers") ;
+ cmdLine.getUsage().startCategory("Output");
+ cmdLine.add(queryOutputSyntaxDecl, "--out, --format", "Output
syntax");
+ cmdLine.add(queryNumberDecl, "--num", "Print line numbers");
}
@Override
@@ -53,42 +53,42 @@ public class ModQueryOut extends ModBase
if ( cmdline.contains(queryOutputSyntaxDecl) )
{
// short name
- String s = cmdline.getValue(queryOutputSyntaxDecl) ;
- Syntax syn = Syntax.lookup(s) ;
+ String s = cmdline.getValue(queryOutputSyntaxDecl);
+ Syntax syn = Syntax.lookup(s);
if ( syn == null )
- cmdline.cmdError("Unrecognized syntax: "+s) ;
- outputSyntax = syn ;
+ cmdline.cmdError("Unrecognized syntax: "+s);
+ outputSyntax = syn;
}
- lineNumbers = cmdline.contains(queryNumberDecl) ;
+ lineNumbers = cmdline.contains(queryNumberDecl);
}
public Syntax getOutputSyntax()
{
- return outputSyntax ;
+ return outputSyntax;
}
public void output(Query query)
- { output(out(), query) ; }
+ { output(out(), query); }
public void output(IndentedWriter out, Query query)
- { QueryOutputUtils.printQuery(out, query, outputSyntax) ; }
+ { QueryOutputUtils.printQuery(out, query, outputSyntax); }
public void outputOp(Query query, boolean printOptimized)
- { outputOp(out(), query, printOptimized) ; }
+ { outputOp(out(), query, printOptimized); }
public void outputOp(IndentedWriter out, Query query, boolean
printOptimized)
- { QueryOutputUtils.printOp(out, query, printOptimized) ; }
+ { QueryOutputUtils.printOp(out, query, printOptimized); }
public void outputQuad(Query query, boolean printOptimized)
- { outputQuad(out(), query, printOptimized) ; }
+ { outputQuad(out(), query, printOptimized); }
public void outputQuad(IndentedWriter out, Query query, boolean
printOptimized)
- { QueryOutputUtils.printQuad(out, query, printOptimized) ; }
+ { QueryOutputUtils.printQuad(out, query, printOptimized); }
private IndentedWriter out()
{
- return new IndentedWriter(System.out, lineNumbers) ;
+ return new IndentedWriter(System.out, lineNumbers);
}
}
diff --git a/jena-cmds/src/main/java/arq/cmdline/ModRemote.java
b/jena-cmds/src/main/java/arq/cmdline/ModRemote.java
index dc2def54f7..a266303c42 100644
--- a/jena-cmds/src/main/java/arq/cmdline/ModRemote.java
+++ b/jena-cmds/src/main/java/arq/cmdline/ModRemote.java
@@ -30,14 +30,14 @@ import org.apache.jena.cmd.ModBase;
public class ModRemote extends ModBase
{
protected final
- ArgDecl serviceDecl = new ArgDecl(ArgDecl.HasValue, "service") ;
+ ArgDecl serviceDecl = new ArgDecl(ArgDecl.HasValue, "service");
// Or --serviceType GET, POST, SOAP
protected final
- ArgDecl postServiceDecl = new ArgDecl(ArgDecl.NoValue, "post", "POST") ;
+ ArgDecl postServiceDecl = new ArgDecl(ArgDecl.NoValue, "post", "POST");
- private String serviceURL ;
- private boolean usePost ;
+ private String serviceURL;
+ private boolean usePost;
public void checkCommandLine(CmdArgModule cmdLine)
{}
@@ -45,31 +45,31 @@ public class ModRemote extends ModBase
@Override
public void processArgs(CmdArgModule cmdLine)
{
- serviceURL = cmdLine.getValue(serviceDecl) ;
- usePost = cmdLine.contains(postServiceDecl) ;
+ serviceURL = cmdLine.getValue(serviceDecl);
+ usePost = cmdLine.contains(postServiceDecl);
}
@Override
public void registerWith(CmdGeneral cmdLine)
{
- cmdLine.getUsage().startCategory("Remote") ;
+ cmdLine.getUsage().startCategory("Remote");
cmdLine.add(serviceDecl,
"--service=",
- "Service endpoint URL") ;
+ "Service endpoint URL");
cmdLine.add(postServiceDecl,
"--post",
- "Force use of HTTP POST") ;
+ "Force use of HTTP POST");
}
public String getServiceURL()
{
- return serviceURL ;
+ return serviceURL;
}
public boolean usePost()
{
- return usePost ;
+ return usePost;
}
diff --git a/jena-cmds/src/main/java/arq/cmdline/ModResultsIn.java
b/jena-cmds/src/main/java/arq/cmdline/ModResultsIn.java
index 97d974a8c8..b3e47f8dc5 100644
--- a/jena-cmds/src/main/java/arq/cmdline/ModResultsIn.java
+++ b/jena-cmds/src/main/java/arq/cmdline/ModResultsIn.java
@@ -22,31 +22,31 @@
package arq.cmdline;
import org.apache.jena.cmd.*;
-import org.apache.jena.query.ResultSet ;
-import org.apache.jena.query.ResultSetFactory ;
-import org.apache.jena.shared.NotFoundException ;
-import org.apache.jena.sparql.ARQInternalErrorException ;
-import org.apache.jena.sparql.resultset.ResultsFormat ;
+import org.apache.jena.query.ResultSet;
+import org.apache.jena.query.ResultSetFactory;
+import org.apache.jena.shared.NotFoundException;
+import org.apache.jena.sparql.ARQInternalErrorException;
+import org.apache.jena.sparql.resultset.ResultsFormat;
public class ModResultsIn extends ModBase
{
- protected final ArgDecl resultsInputFmtDecl = new
ArgDecl(ArgDecl.HasValue, "in") ;
- protected final ArgDecl fileDecl = new ArgDecl(ArgDecl.HasValue, "file") ;
+ protected final ArgDecl resultsInputFmtDecl = new
ArgDecl(ArgDecl.HasValue, "in");
+ protected final ArgDecl fileDecl = new ArgDecl(ArgDecl.HasValue, "file");
private ResultsFormat inputFormat = ResultsFormat.TEXT;
- private String resultsFilename = null ;
- private ResultSet resultSet = null ;
+ private String resultsFilename = null;
+ private ResultSet resultSet = null;
@Override
public void registerWith(CmdGeneral cmdLine)
{
- cmdLine.getUsage().startCategory("Results") ;
+ cmdLine.getUsage().startCategory("Results");
cmdLine.add(fileDecl,
"--file",
- "Input file") ;
+ "Input file");
cmdLine.add(resultsInputFmtDecl,
"--in",
- "Results format (XML, JSON; RDF serialization)") ;
+ "Results format (XML, JSON; RDF serialization)");
}
@Override
@@ -54,32 +54,32 @@ public class ModResultsIn extends ModBase
{
// Input file.
if ( cmdline.contains(fileDecl) )
- resultsFilename = cmdline.getValue(fileDecl) ;
+ resultsFilename = cmdline.getValue(fileDecl);
if ( cmdline.getNumPositional() == 0 && resultsFilename == null )
- cmdline.cmdError("No results file") ;
+ cmdline.cmdError("No results file");
if ( cmdline.getNumPositional() > 1 )
- cmdline.cmdError("Only one result set file allowed") ;
+ cmdline.cmdError("Only one result set file allowed");
if ( cmdline.getNumPositional() == 1 && resultsFilename != null )
- cmdline.cmdError("Either result set file or --file - not both") ;
+ cmdline.cmdError("Either result set file or --file - not both");
if ( resultsFilename == null )
// One positional argument.
- resultsFilename = cmdline.getPositionalArg(0) ;
+ resultsFilename = cmdline.getPositionalArg(0);
// Guess format
if ( resultsFilename != null )
- inputFormat = ResultsFormat.guessSyntax(resultsFilename) ;
+ inputFormat = ResultsFormat.guessSyntax(resultsFilename);
// Set format
if ( cmdline.contains(resultsInputFmtDecl) )
{
- String rFmt = cmdline.getValue(resultsInputFmtDecl) ;
- inputFormat = ResultsFormat.lookup(rFmt) ;
+ String rFmt = cmdline.getValue(resultsInputFmtDecl);
+ inputFormat = ResultsFormat.lookup(rFmt);
if ( inputFormat == null )
- cmdline.cmdError("Unrecognized output format: "+rFmt) ;
+ cmdline.cmdError("Unrecognized output format: "+rFmt);
}
}
@@ -90,45 +90,45 @@ public class ModResultsIn extends ModBase
public ResultSet getResultSet()
{
if ( resultSet != null )
- return resultSet ;
+ return resultSet;
if ( resultsFilename == null )
{
- System.err.println("No result file name" ) ;
- throw new TerminationException(1) ;
+ System.err.println("No result file name" );
+ throw new TerminationException(1);
}
try
{
if ( resultsFilename.equals("--") )
- return ResultSetFactory.load(System.in, inputFormat) ;
- ResultSet rs = ResultSetFactory.load(resultsFilename, inputFormat)
;
+ return ResultSetFactory.load(System.in, inputFormat);
+ ResultSet rs = ResultSetFactory.load(resultsFilename, inputFormat);
if ( rs == null )
{
- System.err.println("Failed to read the result set") ;
- throw new TerminationException(9) ;
+ System.err.println("Failed to read the result set");
+ throw new TerminationException(9);
}
- resultSet = rs ;
- return resultSet ;
+ resultSet = rs;
+ return resultSet;
}
catch (NotFoundException ex)
{
- System.err.println("File not found: "+resultsFilename) ;
- throw new TerminationException(9) ;
+ System.err.println("File not found: "+resultsFilename);
+ throw new TerminationException(9);
}
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) ;
+ intEx.printStackTrace(System.err);
+ throw new TerminationException(99);
}
}
- public ResultsFormat getInputFormat() { return inputFormat ; }
+ public ResultsFormat getInputFormat() { return inputFormat; }
}
diff --git a/jena-cmds/src/main/java/arq/cmdline/ModResultsOut.java
b/jena-cmds/src/main/java/arq/cmdline/ModResultsOut.java
index 3310ec7dc2..606787e2e8 100644
--- a/jena-cmds/src/main/java/arq/cmdline/ModResultsOut.java
+++ b/jena-cmds/src/main/java/arq/cmdline/ModResultsOut.java
@@ -26,10 +26,10 @@ 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.query.ResultSet ;
-import org.apache.jena.sparql.core.Prologue ;
-import org.apache.jena.sparql.resultset.ResultsFormat ;
-import org.apache.jena.sparql.util.QueryExecUtils ;
+import org.apache.jena.query.ResultSet;
+import org.apache.jena.sparql.core.Prologue;
+import org.apache.jena.sparql.resultset.ResultsFormat;
+import org.apache.jena.sparql.util.QueryExecUtils;
public class ModResultsOut extends ModBase {
protected final ArgDecl resultsFmtDecl = new ArgDecl(ArgDecl.HasValue,
"results", "out", "rfmt");
@@ -51,7 +51,7 @@ public class ModResultsOut extends ModBase {
cmdLine.getUsage().startCategory("Results");
cmdLine.add(resultsFmtDecl,
"--results=",
- "Results format (Result set: text, XML, JSON, CSV, TSV;
Graph: RDF serialization)") ;
+ "Results format (Result set: text, XML, JSON, CSV, TSV;
Graph: RDF serialization)");
}
public void checkCommandLine(CmdArgModule cmdLine) {}
diff --git a/jena-cmds/src/main/java/arq/cmdline/ModTime.java
b/jena-cmds/src/main/java/arq/cmdline/ModTime.java
index a3151ba942..8b26ba74ed 100644
--- a/jena-cmds/src/main/java/arq/cmdline/ModTime.java
+++ b/jena-cmds/src/main/java/arq/cmdline/ModTime.java
@@ -21,7 +21,7 @@
package arq.cmdline;
-import org.apache.jena.atlas.lib.Timer ;
+import org.apache.jena.atlas.lib.Timer;
import org.apache.jena.cmd.ArgDecl;
import org.apache.jena.cmd.CmdArgModule;
import org.apache.jena.cmd.CmdGeneral;
@@ -31,17 +31,17 @@ import org.apache.jena.cmd.ModBase;
public class ModTime extends ModBase
{
- protected final ArgDecl timeDecl = new ArgDecl(ArgDecl.NoValue, "time") ;
+ protected final ArgDecl timeDecl = new ArgDecl(ArgDecl.NoValue, "time");
- protected Timer timer = new Timer() ;
+ protected Timer timer = new Timer();
- private boolean timing = false ;
+ private boolean timing = false;
@Override
public void registerWith(CmdGeneral cmdLine)
{
- cmdLine.getUsage().startCategory("Time") ;
- cmdLine.add(timeDecl, "--time", "Time the operation") ;
+ cmdLine.getUsage().startCategory("Time");
+ cmdLine.add(timeDecl, "--time", "Time the operation");
}
public void checkCommandLine(CmdArgModule cmdLine)
@@ -50,26 +50,26 @@ public class ModTime extends ModBase
@Override
public void processArgs(CmdArgModule cmdLine)
{
- timing = cmdLine.contains(timeDecl) ;
+ timing = cmdLine.contains(timeDecl);
}
- public boolean timingEnabled() { return timing ; }
+ public boolean timingEnabled() { return timing; }
- public void setTimingEnabled(boolean timingEnabled) { timing =
timingEnabled ; }
+ public void setTimingEnabled(boolean timingEnabled) { timing =
timingEnabled; }
public void startTimer()
- { timer.startTimer() ; }
+ { timer.startTimer(); }
public long endTimer()
- { return timer.endTimer() ; }
+ { return timer.endTimer(); }
public long readTimer()
- { return timer.readTimer() ; }
+ { return timer.readTimer(); }
public long getTimeInterval()
- { return timer.getTimeInterval() ; }
+ { return timer.getTimeInterval(); }
public String timeStr(long timeInterval)
- { return Timer.timeStr(timeInterval) ; }
+ { return Timer.timeStr(timeInterval); }
}
diff --git a/jena-cmds/src/main/java/arq/qexpr.java
b/jena-cmds/src/main/java/arq/qexpr.java
index fb287ade8b..db124bba4a 100644
--- a/jena-cmds/src/main/java/arq/qexpr.java
+++ b/jena-cmds/src/main/java/arq/qexpr.java
@@ -147,7 +147,7 @@ public class qexpr {
// ==== Do it
- for ( int i = 0 ; i < cl.getNumPositional() ; i++ ) {
+ for ( int i = 0; i < cl.getNumPositional(); i++ ) {
String exprStr = cl.getPositionalArg(i);
exprStr = cl.indirect(exprStr);
@@ -185,7 +185,7 @@ public class qexpr {
ARQ.getContext().set(ARQConstants.sysCurrentTime,
NodeFactoryExtra.nowAsDateTime());
FunctionEnv env =
ExecutionContext.create(ARQ.getContext().copy());
NodeValue r = expr.eval(null, env);
- // System.out.println(r.asQuotedString()) ;
+ // System.out.println(r.asQuotedString());
Node n = r.asNode();
String s = NodeFmtLib.displayStr(n);
System.out.println(s);
diff --git a/jena-cmds/src/main/java/arq/qparse.java
b/jena-cmds/src/main/java/arq/qparse.java
index 2720c58e51..604f13d10e 100644
--- a/jena-cmds/src/main/java/arq/qparse.java
+++ b/jena-cmds/src/main/java/arq/qparse.java
@@ -121,7 +121,7 @@ public class qparse extends CmdARQ {
}
static final String divider = "- - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - -";
- // static final String divider = "" ;
+ // static final String divider = "";
boolean needDivider = false;
private void divider() {
if ( needDivider )
@@ -192,7 +192,7 @@ public class qparse extends CmdARQ {
System.err.println(ex.getMessage());
ex.printStackTrace(System.err);
} catch (QueryException qEx) {
- // System.err.println(qEx.getMessage()) ;
+ // System.err.println(qEx.getMessage());
throw new CmdException("Query Exeception", qEx);
} catch (JenaException ex) {
ex.printStackTrace();
@@ -212,7 +212,7 @@ public class qparse extends CmdARQ {
static void writeSyntaxes(String msg, PrintStream out) {
if ( msg != null )
out.println(msg);
- for ( Iterator<String> iter = Syntax.querySyntaxNames.keys() ;
iter.hasNext() ; ) {
+ for ( Iterator<String> iter = Syntax.querySyntaxNames.keys();
iter.hasNext(); ) {
String k = iter.next();
Syntax v = Syntax.lookup(k);
k = padOut(k, 10);
@@ -222,7 +222,7 @@ public class qparse extends CmdARQ {
static String padOut(String x, int len) {
StringBuilder r = new StringBuilder(x);
- for ( int i = x.length() ; i <= len ; i++ )
+ for ( int i = x.length(); i <= len; i++ )
r.append(" ");
return r.toString();
}
diff --git a/jena-cmds/src/main/java/arq/query.java
b/jena-cmds/src/main/java/arq/query.java
index 36dc8d2ac9..fbbae8b5cb 100644
--- a/jena-cmds/src/main/java/arq/query.java
+++ b/jena-cmds/src/main/java/arq/query.java
@@ -23,46 +23,46 @@ package arq;
import java.io.PrintStream;
-import arq.cmdline.* ;
+import arq.cmdline.*;
import org.apache.commons.io.output.NullPrintStream;
import org.apache.jena.Jena;
import org.apache.jena.atlas.io.IO;
-import org.apache.jena.atlas.io.IndentedWriter ;
-import org.apache.jena.atlas.lib.Lib ;
-import org.apache.jena.atlas.logging.LogCtl ;
+import org.apache.jena.atlas.io.IndentedWriter;
+import org.apache.jena.atlas.lib.Lib;
+import org.apache.jena.atlas.logging.LogCtl;
import org.apache.jena.cmd.ArgDecl;
import org.apache.jena.cmd.CmdException;
import org.apache.jena.cmd.TerminationException;
-import org.apache.jena.query.* ;
-import org.apache.jena.riot.RiotException ;
-import org.apache.jena.riot.RiotNotFoundException ;
-import org.apache.jena.riot.SysRIOT ;
-import org.apache.jena.shared.JenaException ;
+import org.apache.jena.query.*;
+import org.apache.jena.riot.RiotException;
+import org.apache.jena.riot.RiotNotFoundException;
+import org.apache.jena.riot.SysRIOT;
+import org.apache.jena.shared.JenaException;
import org.apache.jena.shared.NotFoundException;
-import org.apache.jena.sparql.ARQInternalErrorException ;
-import org.apache.jena.sparql.core.Transactional ;
+import org.apache.jena.sparql.ARQInternalErrorException;
+import org.apache.jena.sparql.core.Transactional;
import org.apache.jena.sparql.core.TransactionalNull;
-import org.apache.jena.sparql.mgt.Explain ;
-import org.apache.jena.sparql.resultset.ResultSetException ;
-import org.apache.jena.sparql.resultset.ResultsFormat ;
-import org.apache.jena.sparql.util.QueryExecUtils ;
-import org.apache.jena.system.Txn ;
+import org.apache.jena.sparql.mgt.Explain;
+import org.apache.jena.sparql.resultset.ResultSetException;
+import org.apache.jena.sparql.resultset.ResultsFormat;
+import org.apache.jena.sparql.util.QueryExecUtils;
+import org.apache.jena.system.Txn;
public class query extends CmdARQ
{
- private ArgDecl argRepeat = new ArgDecl(ArgDecl.HasValue, "repeat") ;
- private ArgDecl argExplain = new ArgDecl(ArgDecl.NoValue, "explain") ;
- private ArgDecl argOptimize = new ArgDecl(ArgDecl.HasValue, "opt",
"optimize") ;
+ private ArgDecl argRepeat = new ArgDecl(ArgDecl.HasValue, "repeat");
+ private ArgDecl argExplain = new ArgDecl(ArgDecl.NoValue, "explain");
+ private ArgDecl argOptimize = new ArgDecl(ArgDecl.HasValue, "opt",
"optimize");
- protected int repeatCount = 1 ;
- protected int warmupCount = 0 ;
- protected boolean queryOptimization = true ;
+ protected int repeatCount = 1;
+ protected int warmupCount = 0;
+ protected boolean queryOptimization = true;
- protected ModTime modTime = new ModTime() ;
+ protected ModTime modTime = new ModTime();
protected ModQueryIn modQuery = null;
- protected ModDataset modDataset = null ;
- protected ModResultsOut modResults = new ModResultsOut() ;
- protected ModEngine modEngine = new ModEngine() ;
+ protected ModDataset modDataset = null;
+ protected ModResultsOut modResults = new ModResultsOut();
+ protected ModEngine modEngine = new ModEngine();
public static void main(String...argv) {
new query(argv).mainRun();
@@ -97,100 +97,104 @@ public class query extends CmdARQ
* </ul>
*
*/
- protected Syntax getDefaultSyntax() { return Syntax.defaultQuerySyntax
; }
+ protected Syntax getDefaultSyntax() { return
Syntax.defaultQuerySyntax; }
@Override
- protected void processModulesAndArgs()
- {
- super.processModulesAndArgs() ;
- if ( contains(argRepeat) )
- {
- String[] x = getValue(argRepeat).split(",") ;
- if ( x.length == 1 )
- {
- try { repeatCount = Integer.parseInt(x[0]) ; }
- catch (NumberFormatException ex)
- { throw new CmdException("Can't parse "+x[0]+" in arg
"+getValue(argRepeat)+" as an integer") ; }
- }
- else if ( x.length == 2 ) {
- try { warmupCount = Integer.parseInt(x[0]) ; }
- catch (NumberFormatException ex)
- { throw new CmdException("Can't parse "+x[0]+" in arg
"+getValue(argRepeat)+" as an integer") ; }
- try { repeatCount = Integer.parseInt(x[1]) ; }
- catch (NumberFormatException ex)
- { throw new CmdException("Can't parse "+x[1]+" in arg
"+getValue(argRepeat)+" as an integer") ; }
+ protected void processModulesAndArgs() {
+ super.processModulesAndArgs();
+ if ( contains(argRepeat) ) {
+ String[] x = getValue(argRepeat).split(",");
+ if ( x.length == 1 ) {
+ try {
+ repeatCount = Integer.parseInt(x[0]);
+ } catch (NumberFormatException ex) {
+ throw new CmdException("Can't parse " + x[0] + " in arg "
+ getValue(argRepeat) + " as an integer");
+ }
+ } else if ( x.length == 2 ) {
+ try {
+ warmupCount = Integer.parseInt(x[0]);
+ } catch (NumberFormatException ex) {
+ throw new CmdException("Can't parse " + x[0] + " in arg "
+ getValue(argRepeat) + " as an integer");
+ }
+ try {
+ repeatCount = Integer.parseInt(x[1]);
+ } catch (NumberFormatException ex) {
+ throw new CmdException("Can't parse " + x[1] + " in arg "
+ getValue(argRepeat) + " as an integer");
+ }
} else
- throw new CmdException("Wrong format for repeat count:
"+getValue(argRepeat)) ;
+ throw new CmdException("Wrong format for repeat count: " +
getValue(argRepeat));
}
if ( isVerbose() )
- ARQ.getContext().setTrue(ARQ.symLogExec) ;
+ ARQ.getContext().setTrue(ARQ.symLogExec);
if ( hasArg(argExplain) )
- ARQ.setExecutionLogging(Explain.InfoLevel.ALL) ;
+ ARQ.setExecutionLogging(Explain.InfoLevel.ALL);
- if ( hasArg(argOptimize) )
- {
- String x1 = getValue(argOptimize) ;
+ if ( hasArg(argOptimize) ) {
+ String x1 = getValue(argOptimize);
if ( hasValueOfTrue(argOptimize) || x1.equalsIgnoreCase("on") ||
x1.equalsIgnoreCase("yes") )
- queryOptimization = true ;
+ queryOptimization = true;
else if ( hasValueOfFalse(argOptimize) ||
x1.equalsIgnoreCase("off") || x1.equalsIgnoreCase("no") )
- queryOptimization = false ;
- else throw new CmdException("Optimization flag must be
true/false/on/off/yes/no. Found: "+getValue(argOptimize)) ;
+ queryOptimization = false;
+ else
+ throw new CmdException("Optimization flag must be
true/false/on/off/yes/no. Found: " + getValue(argOptimize));
}
}
- protected ModDataset setModDataset()
- {
- return new ModDatasetGeneralAssembler() ;
+ protected ModDataset setModDataset() {
+ return new ModDatasetGeneralAssembler();
}
@Override
- protected void exec()
- {
- if ( ! queryOptimization )
- ARQ.getContext().setFalse(ARQ.optimization) ;
+ protected void exec() {
+ if ( !queryOptimization )
+ ARQ.getContext().setFalse(ARQ.optimization);
if ( cmdStrictMode )
- ARQ.getContext().setFalse(ARQ.optimization) ;
+ ARQ.getContext().setFalse(ARQ.optimization);
// Warm up.
- for ( int i = 0 ; i < warmupCount ; i++ )
+ for ( int i = 0; i < warmupCount; i++ )
// Include the results format so that is warmed up as well.
- queryExec(false, modResults.getResultsFormat(),
NullPrintStream.INSTANCE) ;
+ queryExec(false, modResults.getResultsFormat(),
NullPrintStream.INSTANCE);
- for ( int i = 0 ; i < repeatCount ; i++ )
- queryExec(modTime.timingEnabled(), modResults.getResultsFormat(),
System.out) ;
+ for ( int i = 0; i < repeatCount; i++ )
+ queryExec(modTime.timingEnabled(), modResults.getResultsFormat(),
System.out);
if ( modTime.timingEnabled() && repeatCount > 1 ) {
- long avg = totalTime/repeatCount ;
- String avgStr = modTime.timeStr(avg) ;
- System.err.println("Total time: "+modTime.timeStr(totalTime)+" sec
for repeat count of "+repeatCount+ " : average: "+avgStr) ;
+ long avg = totalTime / repeatCount;
+ String avgStr = modTime.timeStr(avg);
+ System.err.println("Total time: " + modTime.timeStr(totalTime) + "
sec for repeat count of " + repeatCount + " : average: "
+ + avgStr);
}
modEngine.resetRegistrations();
}
@Override
- protected String getCommandName() { return Lib.className(this) ; }
+ protected String getCommandName() {
+ return Lib.className(this);
+ }
@Override
- protected String getSummary() { return getCommandName()+" --data=<file>
--query=<query>" ; }
+ protected String getSummary() {
+ return getCommandName() + " --data=<file> --query=<query>";
+ }
- /** Choose the dataset.
- * <li> use the data as described on the command line
- * <li> else use FROM/FROM NAMED if present (pass null to ARQ)
- * <li> else provided an empty dataset and hope the query has VALUES/BIND
+ /**
+ * Choose the dataset.
+ * <li>use the data as described on the command line
+ * <li>else use FROM/FROM NAMED if present (pass null to ARQ)
+ * <li>else provided an empty dataset and hope the query has VALUES/BIND
*/
- protected Dataset getDataset(Query query) {
+ protected Dataset getDataset(Query query) {
try {
Dataset ds = modDataset.getDataset();
if ( ds == null )
ds = dealWithNoDataset(query);
return ds;
- }
- catch (RiotNotFoundException ex) {
+ } catch (RiotNotFoundException ex) {
System.err.println("Failed to load data: " + ex.getMessage());
throw new TerminationException(1);
- }
- catch (RiotException ex) {
+ } catch (RiotException ex) {
System.err.println("Failed to load data");
throw new TerminationException(1);
}
@@ -198,25 +202,25 @@ public class query extends CmdARQ
protected Query getQuery() {
try {
- return modQuery.getQuery() ;
+ return modQuery.getQuery();
} catch (NotFoundException ex) {
- System.err.println("Failed to load query: "+ex.getMessage());
+ System.err.println("Failed to load query: " + ex.getMessage());
throw new TerminationException(1);
}
}
// Policy for no command line dataset. null means "whatever" (use FROM)
- protected Dataset dealWithNoDataset(Query query) {
+ protected Dataset dealWithNoDataset(Query query) {
if ( query.hasDatasetDescription() )
return null;
return DatasetFactory.createTxnMem();
- //throw new CmdException("No dataset provided") ;
+ // throw new CmdException("No dataset provided");
}
- protected long totalTime = 0 ;
+ protected long totalTime = 0;
protected void queryExec(boolean timed, ResultsFormat fmt, PrintStream
resultsDest) {
try {
- Query query = getQuery() ;
+ Query query = getQuery();
if ( isVerbose() ) {
IndentedWriter out = new IndentedWriter(resultsDest, true);
query.serialize(out);
@@ -226,18 +230,19 @@ public class query extends CmdARQ
}
if ( isQuiet() )
- LogCtl.setError(SysRIOT.riotLoggerName) ;
- Dataset dataset = getDataset(query) ;
+ LogCtl.setError(SysRIOT.riotLoggerName);
+ Dataset dataset = getDataset(query);
// Check there is a dataset. See dealWithNoDataset(query).
- // The default policy is to create an empty one - convenience for
VALUES and BIND providing the data.
+ // The default policy is to create an empty one - convenience for
VALUES
+ // and BIND providing the data.
if ( dataset == null && !query.hasDatasetDescription() ) {
System.err.println("Dataset not specified in query nor
provided on command line.");
throw new TerminationException(1);
}
- Transactional transactional = (dataset != null &&
dataset.supportsTransactions()) ? dataset : new TransactionalNull() ;
- Txn.executeRead(transactional, ()->{
- modTime.startTimer() ;
- try ( QueryExecution qe = QueryExecutionFactory.create(query,
dataset) ) {
+ Transactional transactional = (dataset != null &&
dataset.supportsTransactions()) ? dataset : new TransactionalNull();
+ Txn.executeRead(transactional, () -> {
+ modTime.startTimer();
+ try (QueryExecution qe = QueryExecutionFactory.create(query,
dataset)) {
try {
QueryExecUtils.executeQuery(query, qe, fmt,
resultsDest);
} catch (QueryCancelledException ex) {
@@ -249,30 +254,26 @@ public class query extends CmdARQ
totalTime += time;
System.err.println("Time: " + modTime.timeStr(time) +
" sec");
}
- }
- catch (ResultSetException ex) {
+ } catch (ResultSetException ex) {
System.err.println(ex.getMessage());
ex.printStackTrace(System.err);
- }
- catch (QueryException qEx) {
- // System.err.println(qEx.getMessage()) ;
+ } catch (QueryException qEx) {
+ // System.err.println(qEx.getMessage());
throw new CmdException("Query Exeception", qEx);
}
});
- }
- catch (ARQInternalErrorException intEx) {
- System.err.println(intEx.getMessage()) ;
- if ( intEx.getCause() != null )
- {
- System.err.println("Cause:") ;
- intEx.getCause().printStackTrace(System.err) ;
- System.err.println() ;
+ } catch (ARQInternalErrorException intEx) {
+ System.err.println(intEx.getMessage());
+ if ( intEx.getCause() != null ) {
+ System.err.println("Cause:");
+ intEx.getCause().printStackTrace(System.err);
+ System.err.println();
}
- intEx.printStackTrace(System.err) ;
- }
- catch (JenaException | CmdException ex) { throw ex ; }
- catch (Exception ex) {
- throw new CmdException("Exception", ex) ;
+ intEx.printStackTrace(System.err);
+ } catch (JenaException | CmdException ex) {
+ throw ex;
+ } catch (Exception ex) {
+ throw new CmdException("Exception", ex);
}
}
}
diff --git a/jena-cmds/src/main/java/arq/rsparql.java
b/jena-cmds/src/main/java/arq/rsparql.java
index b16e9641dd..f34e22ebf6 100644
--- a/jena-cmds/src/main/java/arq/rsparql.java
+++ b/jena-cmds/src/main/java/arq/rsparql.java
@@ -21,24 +21,24 @@
package arq;
-import arq.cmdline.CmdARQ ;
-import arq.cmdline.ModQueryIn ;
-import arq.cmdline.ModRemote ;
-import arq.cmdline.ModResultsOut ;
+import arq.cmdline.CmdARQ;
+import arq.cmdline.ModQueryIn;
+import arq.cmdline.ModRemote;
+import arq.cmdline.ModResultsOut;
import org.apache.jena.cmd.CmdException;
-import org.apache.jena.query.Query ;
-import org.apache.jena.query.Syntax ;
-import org.apache.jena.sparql.engine.http.QueryExceptionHTTP ;
+import org.apache.jena.query.Query;
+import org.apache.jena.query.Syntax;
+import org.apache.jena.sparql.engine.http.QueryExceptionHTTP;
import org.apache.jena.sparql.exec.http.QueryExecutionHTTP;
import org.apache.jena.sparql.exec.http.QueryExecutionHTTPBuilder;
import org.apache.jena.sparql.exec.http.QuerySendMode;
-import org.apache.jena.sparql.util.QueryExecUtils ;
+import org.apache.jena.sparql.util.QueryExecUtils;
public class rsparql extends CmdARQ
{
- protected ModQueryIn modQuery = new ModQueryIn(Syntax.syntaxARQ) ;
- protected ModRemote modRemote = new ModRemote() ;
- protected ModResultsOut modResults = new ModResultsOut() ;
+ protected ModQueryIn modQuery = new ModQueryIn(Syntax.syntaxARQ);
+ protected ModRemote modRemote = new ModRemote();
+ protected ModResultsOut modResults = new ModResultsOut();
public static void main(String...argv) {
new rsparql(argv).mainRun();
diff --git a/jena-cmds/src/main/java/arq/sparql.java
b/jena-cmds/src/main/java/arq/sparql.java
index 1858af5282..87a9937507 100644
--- a/jena-cmds/src/main/java/arq/sparql.java
+++ b/jena-cmds/src/main/java/arq/sparql.java
@@ -21,20 +21,20 @@
package arq;
-import org.apache.jena.query.Syntax ;
+import org.apache.jena.query.Syntax;
/** A program to execute queries from the command line in SPARQL mode. */
public class sparql extends query
{
public static void main(String... argv) {
- new sparql(argv).mainRun() ;
+ new sparql(argv).mainRun();
}
public sparql(String[] argv) {
- super(argv) ;
+ super(argv);
}
@Override
- protected Syntax getDefaultSyntax() { return Syntax.syntaxARQ ; }
+ protected Syntax getDefaultSyntax() { return Syntax.syntaxARQ; }
}
diff --git a/jena-cmds/src/main/java/arq/sse.java
b/jena-cmds/src/main/java/arq/sse.java
index 9ea5fde7cd..afd0d065b2 100644
--- a/jena-cmds/src/main/java/arq/sse.java
+++ b/jena-cmds/src/main/java/arq/sse.java
@@ -21,90 +21,90 @@
package arq;
-import org.apache.jena.atlas.io.IndentedWriter ;
-import org.apache.jena.atlas.lib.Lib ;
+import org.apache.jena.atlas.io.IndentedWriter;
+import org.apache.jena.atlas.lib.Lib;
import org.apache.jena.cmd.ArgDecl;
import org.apache.jena.cmd.TerminationException;
-import org.apache.jena.shared.PrefixMapping ;
-import org.apache.jena.sparql.serializer.SerializationContext ;
-import org.apache.jena.sparql.sse.Item ;
-import org.apache.jena.sparql.sse.ItemWriter ;
-import org.apache.jena.sparql.sse.SSE ;
+import org.apache.jena.shared.PrefixMapping;
+import org.apache.jena.sparql.serializer.SerializationContext;
+import org.apache.jena.sparql.sse.Item;
+import org.apache.jena.sparql.sse.ItemWriter;
+import org.apache.jena.sparql.sse.SSE;
-import arq.cmdline.CmdARQ_SSE ;
+import arq.cmdline.CmdARQ_SSE;
public class sse extends CmdARQ_SSE
{
- protected final ArgDecl numberDecl = new ArgDecl(ArgDecl.HasValue,
"num", "number") ;
- protected final ArgDecl noPrintDecl = new ArgDecl(ArgDecl.NoValue,
"n") ;
- protected final ArgDecl noResolveDecl = new ArgDecl(ArgDecl.NoValue,
"raw") ;
+ protected final ArgDecl numberDecl = new ArgDecl(ArgDecl.HasValue,
"num", "number");
+ protected final ArgDecl noPrintDecl = new ArgDecl(ArgDecl.NoValue,
"n");
+ protected final ArgDecl noResolveDecl = new ArgDecl(ArgDecl.NoValue,
"raw");
- private boolean print = true ;
- private boolean structural = true ;
- private boolean lineNumbers = false ;
+ private boolean print = true;
+ private boolean structural = true;
+ private boolean lineNumbers = false;
public static void main (String... argv)
{
- new sse(argv).mainRun() ;
+ new sse(argv).mainRun();
}
public sse(String[] argv)
{
- super(argv) ;
- super.add(noPrintDecl, "-n", "Don't print the
expression") ;
- super.add(numberDecl, "--num [on|off]", "Numbers") ;
- super.add(noResolveDecl, "--raw", "Don't handle base or prefix
names specially") ;
+ super(argv);
+ super.add(noPrintDecl, "-n", "Don't print the
expression");
+ super.add(numberDecl, "--num [on|off]", "Numbers");
+ super.add(noResolveDecl, "--raw", "Don't handle base or prefix
names specially");
}
@Override
protected void processModulesAndArgs()
{
- super.processModulesAndArgs() ;
- print = !contains(noPrintDecl) ;
+ super.processModulesAndArgs();
+ print = !contains(noPrintDecl);
if ( contains(numberDecl) )
- lineNumbers = getValue(numberDecl).equalsIgnoreCase("on") ;
+ lineNumbers = getValue(numberDecl).equalsIgnoreCase("on");
if ( contains(noResolveDecl) )
- SSE.setUseResolver(false) ;
+ SSE.setUseResolver(false);
}
@Override
- protected String getCommandName() { return Lib.className(this) ; }
+ protected String getCommandName() { return Lib.className(this); }
@Override
- protected String getSummary() { return getCommandName() ; }
+ protected String getSummary() { return getCommandName(); }
- static final String divider = "- - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - -" ;
- //static final String divider = "" ;
+ static final String divider = "- - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - -";
+ //static final String divider = "";
- boolean needDivider = false ;
+ boolean needDivider = false;
private void divider()
{
- if ( needDivider ) System.out.println(divider) ;
- needDivider = true ;
+ if ( needDivider ) System.out.println(divider);
+ needDivider = true;
}
@Override
protected void exec(Item item)
{
if ( ! print )
- return ;
+ return;
if ( item == null )
{
- System.err.println("No expression") ;
- throw new TerminationException(9) ;
+ System.err.println("No expression");
+ throw new TerminationException(9);
}
- divider() ;
- IndentedWriter out = new IndentedWriter(System.out, lineNumbers) ;
+ divider();
+ IndentedWriter out = new IndentedWriter(System.out, lineNumbers);
// Need to check if used.
- //PrefixMapping pmap = SSE.getDefaultPrefixMapWrite() ;
- PrefixMapping pmap = null ;
- SerializationContext sCxt = new SerializationContext(pmap) ;
- ItemWriter.write(out, item, sCxt) ;
- //item.output(out) ;
- out.ensureStartOfLine() ;
+ //PrefixMapping pmap = SSE.getDefaultPrefixMapWrite();
+ PrefixMapping pmap = null;
+ SerializationContext sCxt = new SerializationContext(pmap);
+ ItemWriter.write(out, item, sCxt);
+ //item.output(out);
+ out.ensureStartOfLine();
out.flush();
}
}
diff --git a/jena-cmds/src/main/java/arq/sse_exec.java
b/jena-cmds/src/main/java/arq/sse_exec.java
index f2360c2499..2c2f0ffb4a 100644
--- a/jena-cmds/src/main/java/arq/sse_exec.java
+++ b/jena-cmds/src/main/java/arq/sse_exec.java
@@ -21,33 +21,33 @@
package arq;
-import org.apache.jena.atlas.lib.Lib ;
-import org.apache.jena.sparql.sse.Item ;
-import org.apache.jena.sparql.sse.builders.BuilderExec ;
-import arq.cmdline.CmdARQ_SSE ;
+import org.apache.jena.atlas.lib.Lib;
+import org.apache.jena.sparql.sse.Item;
+import org.apache.jena.sparql.sse.builders.BuilderExec;
+import arq.cmdline.CmdARQ_SSE;
public class sse_exec extends CmdARQ_SSE
{
public static void main (String... argv)
{
- new sse_exec(argv).mainRun() ;
+ new sse_exec(argv).mainRun();
}
public sse_exec(String[] argv)
{
- super(argv) ;
+ super(argv);
}
@Override
- protected String getCommandName() { return Lib.className(this) ; }
+ protected String getCommandName() { return Lib.className(this); }
@Override
- protected String getSummary() { return getCommandName()+" [--file<file> |
string]" ; }
+ protected String getSummary() { return getCommandName()+" [--file<file> |
string]"; }
@Override
protected void exec(Item item)
{
- BuilderExec.exec(item) ;
+ BuilderExec.exec(item);
}
}
diff --git a/jena-cmds/src/main/java/arq/sse_query.java
b/jena-cmds/src/main/java/arq/sse_query.java
index 1e3ea04699..bd79ad6221 100644
--- a/jena-cmds/src/main/java/arq/sse_query.java
+++ b/jena-cmds/src/main/java/arq/sse_query.java
@@ -22,28 +22,28 @@
package arq;
-import org.apache.jena.atlas.io.IndentedWriter ;
-import org.apache.jena.atlas.lib.Lib ;
+import org.apache.jena.atlas.io.IndentedWriter;
+import org.apache.jena.atlas.lib.Lib;
import org.apache.jena.cmd.ArgDecl;
import org.apache.jena.cmd.CmdException;
import org.apache.jena.cmd.TerminationException;
-import org.apache.jena.query.Dataset ;
-import org.apache.jena.query.DatasetFactory ;
-import org.apache.jena.sparql.algebra.Algebra ;
-import org.apache.jena.sparql.algebra.Op ;
-import org.apache.jena.sparql.core.DatasetGraph ;
-import org.apache.jena.sparql.engine.Plan ;
-import org.apache.jena.sparql.engine.PlanOp ;
-import org.apache.jena.sparql.engine.QueryIterator ;
-import org.apache.jena.sparql.util.QueryExecUtils ;
-
-import arq.cmdline.CmdARQ ;
-import arq.cmdline.ModAlgebra ;
-import arq.cmdline.ModDataset ;
-import arq.cmdline.ModDatasetGeneralAssembler ;
-import arq.cmdline.ModEngine ;
-import arq.cmdline.ModResultsOut ;
-import arq.cmdline.ModTime ;
+import org.apache.jena.query.Dataset;
+import org.apache.jena.query.DatasetFactory;
+import org.apache.jena.sparql.algebra.Algebra;
+import org.apache.jena.sparql.algebra.Op;
+import org.apache.jena.sparql.core.DatasetGraph;
+import org.apache.jena.sparql.engine.Plan;
+import org.apache.jena.sparql.engine.PlanOp;
+import org.apache.jena.sparql.engine.QueryIterator;
+import org.apache.jena.sparql.util.QueryExecUtils;
+
+import arq.cmdline.CmdARQ;
+import arq.cmdline.ModAlgebra;
+import arq.cmdline.ModDataset;
+import arq.cmdline.ModDatasetGeneralAssembler;
+import arq.cmdline.ModEngine;
+import arq.cmdline.ModResultsOut;
+import arq.cmdline.ModTime;
public class sse_query extends CmdARQ
{
@@ -53,112 +53,112 @@ public class sse_query extends CmdARQ
// 3 - Printing plan - uses a verbose prefix setting. Scan to see what's
in use.
// WriterOp.reducePrologue(prologue, op) => prologue.
- protected final ArgDecl printDecl = new ArgDecl(ArgDecl.HasValue,
"print") ;
+ protected final ArgDecl printDecl = new ArgDecl(ArgDecl.HasValue,
"print");
- ModAlgebra modAlgebra = new ModAlgebra() ;
- ModDataset modDataset = new ModDatasetGeneralAssembler() ;
- ModResultsOut modResults = new ModResultsOut() ;
- ModTime modTime = new ModTime() ;
- ModEngine modEngine = new ModEngine() ;
-
- boolean printOp = false ;
- boolean printPlan = false ;
+ ModAlgebra modAlgebra = new ModAlgebra();
+ ModDataset modDataset = new ModDatasetGeneralAssembler();
+ ModResultsOut modResults = new ModResultsOut();
+ ModTime modTime = new ModTime();
+ ModEngine modEngine = new ModEngine();
+
+ boolean printOp = false;
+ boolean printPlan = false;
public static void main (String... argv)
{
- new sse_query(argv).mainRun() ;
+ new sse_query(argv).mainRun();
}
public sse_query(String[] argv)
{
- super(argv) ;
- super.add(printDecl, "--print=op/plan", "Print details") ;
- super.addModule(modAlgebra) ;
- super.addModule(modResults) ;
- super.addModule(modDataset) ;
- super.addModule(modTime) ;
- super.addModule(modEngine) ;
+ super(argv);
+ super.add(printDecl, "--print=op/plan", "Print details");
+ super.addModule(modAlgebra);
+ super.addModule(modResults);
+ super.addModule(modDataset);
+ super.addModule(modTime);
+ super.addModule(modEngine);
}
@Override
protected void processModulesAndArgs()
{
- super.processModulesAndArgs() ;
+ super.processModulesAndArgs();
for (String arg : getValues(printDecl))
{
if ( arg.equalsIgnoreCase("op") ||
arg.equalsIgnoreCase("alg") ||
- arg.equalsIgnoreCase("algebra") ) { printOp = true ; }
- else if ( arg.equalsIgnoreCase("plan")) { printPlan = true ; }
+ arg.equalsIgnoreCase("algebra") ) { printOp = true; }
+ else if ( arg.equalsIgnoreCase("plan")) { printPlan = true; }
else
- throw new CmdException("Not a recognized print form: "+arg+" :
Choices are: query, op, quad") ;
+ throw new CmdException("Not a recognized print form: "+arg+" :
Choices are: query, op, quad");
}
}
@Override
- protected String getCommandName() { return Lib.className(this) ; }
+ protected String getCommandName() { return Lib.className(this); }
@Override
- protected String getSummary() { return getCommandName()+" --data=<file>
--query=<query>" ; }
+ protected String getSummary() { return getCommandName()+" --data=<file>
--query=<query>"; }
- static final String divider = "- - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - -" ;
- //static final String divider = "" ;
- boolean needDivider = false ;
+ static final String divider = "- - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - -";
+ //static final String divider = "";
+ boolean needDivider = false;
private void divider()
{
- if ( needDivider ) System.out.println(divider) ;
- needDivider = true ;
+ if ( needDivider ) System.out.println(divider);
+ needDivider = true;
}
@Override
protected void exec()
{
- Op op = modAlgebra.getOp() ;
+ Op op = modAlgebra.getOp();
if ( op == null )
{
- System.err.println("No query expression to execute") ;
- throw new TerminationException(9) ;
+ System.err.println("No query expression to execute");
+ throw new TerminationException(9);
}
- Dataset dataset = modDataset.getDataset() ;
+ Dataset dataset = modDataset.getDataset();
// Check there is a dataset.
if ( dataset == null )
- dataset = DatasetFactory.createGeneral() ;
+ dataset = DatasetFactory.createGeneral();
- modTime.startTimer() ;
- DatasetGraph dsg = dataset.asDatasetGraph() ;
+ modTime.startTimer();
+ DatasetGraph dsg = dataset.asDatasetGraph();
if ( printOp || printPlan )
{
if ( printOp )
{
- divider() ;
- IndentedWriter out = new IndentedWriter(System.out, true) ;
- op.output(out) ;
+ divider();
+ IndentedWriter out = new IndentedWriter(System.out, true);
+ op.output(out);
out.flush();
}
if ( printPlan )
{
- QueryIterator qIter = Algebra.exec(op, dsg) ;
- Plan plan = new PlanOp(op, null, qIter) ;
- divider() ;
- IndentedWriter out = new IndentedWriter(System.out, false) ;
- plan.output(out) ;
+ QueryIterator qIter = Algebra.exec(op, dsg);
+ Plan plan = new PlanOp(op, null, qIter);
+ divider();
+ IndentedWriter out = new IndentedWriter(System.out, false);
+ plan.output(out);
out.flush();
}
- //return ;
+ //return;
}
// Do not optimize. Execute as-is.
- QueryExecUtils.execute(op, dsg, modResults.getResultsFormat()) ;
+ QueryExecUtils.execute(op, dsg, modResults.getResultsFormat());
- long time = modTime.endTimer() ;
+ long time = modTime.endTimer();
if ( modTime.timingEnabled() )
- System.out.println("Time: "+modTime.timeStr(time)) ;
+ System.out.println("Time: "+modTime.timeStr(time));
}
}
diff --git a/jena-cmds/src/main/java/arq/uparse.java
b/jena-cmds/src/main/java/arq/uparse.java
index 1a04b0dbd7..9d909837d0 100644
--- a/jena-cmds/src/main/java/arq/uparse.java
+++ b/jena-cmds/src/main/java/arq/uparse.java
@@ -21,59 +21,59 @@
package arq;
-import java.io.IOException ;
-import java.util.List ;
+import java.io.IOException;
+import java.util.List;
-import arq.cmdline.CmdARQ ;
-import org.apache.jena.atlas.io.IndentedLineBuffer ;
-import org.apache.jena.atlas.lib.Lib ;
-import org.apache.jena.atlas.logging.LogCtl ;
+import arq.cmdline.CmdARQ;
+import org.apache.jena.atlas.io.IndentedLineBuffer;
+import org.apache.jena.atlas.lib.Lib;
+import org.apache.jena.atlas.logging.LogCtl;
import org.apache.jena.cmd.ArgDecl;
import org.apache.jena.cmd.CmdException;
-import org.apache.jena.query.ARQ ;
-import org.apache.jena.query.QueryException ;
-import org.apache.jena.query.QueryParseException ;
-import org.apache.jena.query.Syntax ;
-import org.apache.jena.sparql.core.QueryCheckException ;
-import org.apache.jena.sparql.lang.QueryParserBase ;
-import org.apache.jena.sparql.modify.request.UpdateWriter ;
-import org.apache.jena.update.UpdateFactory ;
-import org.apache.jena.update.UpdateRequest ;
-import org.apache.jena.util.FileUtils ;
+import org.apache.jena.query.ARQ;
+import org.apache.jena.query.QueryException;
+import org.apache.jena.query.QueryParseException;
+import org.apache.jena.query.Syntax;
+import org.apache.jena.sparql.core.QueryCheckException;
+import org.apache.jena.sparql.lang.QueryParserBase;
+import org.apache.jena.sparql.modify.request.UpdateWriter;
+import org.apache.jena.update.UpdateFactory;
+import org.apache.jena.update.UpdateRequest;
+import org.apache.jena.util.FileUtils;
public class uparse extends CmdARQ
{
- protected static final ArgDecl argFile = new
ArgDecl(ArgDecl.HasValue, "file", "update") ;
- protected static final ArgDecl argSyntax = new
ArgDecl(ArgDecl.HasValue, "syntax", "syn") ;
- protected static final ArgDecl argBase = new
ArgDecl(ArgDecl.HasValue, "base") ;
- protected static final ArgDecl argDeclPrint = new
ArgDecl(ArgDecl.HasValue, "print") ;
- protected static final ArgDecl argDeclFixup = new
ArgDecl(ArgDecl.NoValue, "fixup") ;
-
- List<String> requestFiles = null ;
- protected Syntax updateSyntax = null ;
+ protected static final ArgDecl argFile = new
ArgDecl(ArgDecl.HasValue, "file", "update");
+ protected static final ArgDecl argSyntax = new
ArgDecl(ArgDecl.HasValue, "syntax", "syn");
+ protected static final ArgDecl argBase = new
ArgDecl(ArgDecl.HasValue, "base");
+ protected static final ArgDecl argDeclPrint = new
ArgDecl(ArgDecl.HasValue, "print");
+ protected static final ArgDecl argDeclFixup = new
ArgDecl(ArgDecl.NoValue, "fixup");
+
+ List<String> requestFiles = null;
+ protected Syntax updateSyntax = null;
protected String baseURI = null;
protected boolean fixup = false;
- private boolean printUpdate = false ;
- private boolean printNone = false ;
+ private boolean printUpdate = false;
+ private boolean printNone = false;
public static void main (String... argv)
- { new uparse(argv).mainRun() ; }
+ { new uparse(argv).mainRun(); }
protected uparse(String[] argv) {
- super(argv) ;
- super.add(argFile, "--file=FILE", "Update commands to
parse") ;
- super.add(argSyntax, "--syntax=name", "Update syntax") ;
+ super(argv);
+ super.add(argFile, "--file=FILE", "Update commands to
parse");
+ super.add(argSyntax, "--syntax=name", "Update syntax");
super.add(argBase, "--base=IRI", "Base URI");
- super.add(argDeclPrint, "--print", "Print in various forms
[update, none]") ;
- super.add(argDeclFixup, "--fixup", "Convert undeclared prefix
names to URIs") ;
+ super.add(argDeclPrint, "--print", "Print in various forms
[update, none]");
+ super.add(argDeclFixup, "--fixup", "Convert undeclared prefix
names to URIs");
}
@Override
protected void processModulesAndArgs() {
- requestFiles = getValues(argFile) ;
- super.processModulesAndArgs() ;
+ requestFiles = getValues(argFile);
+ super.processModulesAndArgs();
if ( super.cmdStrictMode )
- updateSyntax = Syntax.syntaxSPARQL_12 ;
+ updateSyntax = Syntax.syntaxSPARQL_12;
if ( super.contains(argDeclFixup) )
fixup = true;
@@ -81,11 +81,11 @@ public class uparse extends CmdARQ
// Set syntax
if ( super.contains(argSyntax) ) {
// short name
- String s = super.getValue(argSyntax) ;
- Syntax syn = Syntax.lookup(s) ;
+ String s = super.getValue(argSyntax);
+ Syntax syn = Syntax.lookup(s);
if ( syn == null )
- super.cmdError("Unrecognized syntax: " + s + " ; Choices are:
arq, sparql, sparql10, sparql11)") ;
- updateSyntax = syn ;
+ super.cmdError("Unrecognized syntax: " + s + "; Choices are:
arq, sparql, sparql10, sparql11)");
+ updateSyntax = syn;
}
for ( String arg : getValues( argDeclPrint ) ) {
@@ -101,14 +101,14 @@ public class uparse extends CmdARQ
baseURI = super.getValue(argBase);
if ( !printUpdate && ! printNone )
- printUpdate = true ;
+ printUpdate = true;
}
@Override
- protected String getCommandName() { return Lib.className(this) ; }
+ protected String getCommandName() { return Lib.className(this); }
@Override
- protected String getSummary() { return getCommandName()+" --file=<request
file> | <update string>" ; }
+ protected String getSummary() { return getCommandName()+" --file=<request
file> | <update string>"; }
@Override
protected void exec() {
@@ -158,7 +158,7 @@ public class uparse extends CmdARQ
System.err.println(ex.getMessage());
return;
}
- // req.output(IndentedWriter.stderr) ;
+ // req.output(IndentedWriter.stderr);
if ( printUpdate )
System.out.print(req);
@@ -174,20 +174,20 @@ public class uparse extends CmdARQ
if ( ex.getCause() != null )
ex.getCause().printStackTrace(System.err);
}
- finally { LogCtl.setLevel(QueryParserBase.ParserLoggerName, "INFO") ; }
+ finally { LogCtl.setLevel(QueryParserBase.ParserLoggerName, "INFO"); }
}
public static class UpdateCheckException extends QueryException {
- public UpdateCheckException() { super() ; }
- public UpdateCheckException(Throwable cause) { super(cause) ; }
- public UpdateCheckException(String msg) { super(msg) ; }
- public UpdateCheckException(String msg, Throwable cause) { super(msg,
cause) ; }
+ public UpdateCheckException() { super(); }
+ public UpdateCheckException(Throwable cause) { super(cause); }
+ public UpdateCheckException(String msg) { super(msg); }
+ public UpdateCheckException(String msg, Throwable cause) { super(msg,
cause); }
}
public static void checkUpdate(UpdateRequest req, Syntax syntax) {
- IndentedLineBuffer w = new IndentedLineBuffer() ;
- UpdateWriter.output(req, w) ;
- String updateString2 = w.asString() ;
+ IndentedLineBuffer w = new IndentedLineBuffer();
+ UpdateWriter.output(req, w);
+ String updateString2 = w.asString();
UpdateRequest req2;
try {
@@ -204,18 +204,18 @@ public class uparse extends CmdARQ
}
// if ( req.hashCode() != req2.hashCode() )
-// throw new UpdateCheckException("reparsed query hashCode does not
equal parsed input update \nUpdate (hashCode: " + req.hashCode() + ")=\n" + req
+ "\n\nUpdate2 (hashCode: " + req2.hashCode() + ")=\n" + req2) ;
+// throw new UpdateCheckException("reparsed query hashCode does not
equal parsed input update \nUpdate (hashCode: " + req.hashCode() + ")=\n" + req
+ "\n\nUpdate2 (hashCode: " + req2.hashCode() + ")=\n" + req2);
//
// if ( ! req.equals(req2) )
-// throw new UpdateCheckException("reparsed output does not equal
parsed input") ;
+// throw new UpdateCheckException("reparsed output does not equal
parsed input");
}
- static final String divider = "- - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - -" ;
- //static final String divider = "" ;
- static boolean needDivider = false ;
+ static final String divider = "- - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - -";
+ //static final String divider = "";
+ static boolean needDivider = false;
private static void divider() {
- if ( needDivider ) System.out.println(divider) ;
- needDivider = true ;
+ if ( needDivider ) System.out.println(divider);
+ needDivider = true;
}
}
diff --git a/jena-cmds/src/main/java/arq/utf8.java
b/jena-cmds/src/main/java/arq/utf8.java
index d6284b2e42..5cf1e01f89 100644
--- a/jena-cmds/src/main/java/arq/utf8.java
+++ b/jena-cmds/src/main/java/arq/utf8.java
@@ -27,6 +27,6 @@ public class utf8
/** Simple program to help hunt down bad UTF-8 encoded characters */
public static void main(String... args)
{
- riotcmd.utf8.main(args) ;
+ riotcmd.utf8.main(args);
}
}
diff --git a/jena-cmds/src/main/java/arq/wwwdec.java
b/jena-cmds/src/main/java/arq/wwwdec.java
index efa8dd3cf7..2a72512f58 100644
--- a/jena-cmds/src/main/java/arq/wwwdec.java
+++ b/jena-cmds/src/main/java/arq/wwwdec.java
@@ -21,7 +21,7 @@
package arq;
-import org.apache.jena.atlas.lib.StrUtils ;
+import org.apache.jena.atlas.lib.StrUtils;
public class wwwdec
{
@@ -29,11 +29,11 @@ public class wwwdec
{
for ( String x : args)
{
- String y = StrUtils.decodeHex(x, '%') ;
- System.out.println(y) ;
+ String y = StrUtils.decodeHex(x, '%');
+ System.out.println(y);
-// String s2 = URLDecoder.decode(x, "utf-8") ;
-// System.out.println(s2) ;
+// String s2 = URLDecoder.decode(x, "utf-8");
+// System.out.println(s2);
}
}
}
diff --git a/jena-cmds/src/main/java/arq/wwwenc.java
b/jena-cmds/src/main/java/arq/wwwenc.java
index 5c747291af..078e248d3a 100644
--- a/jena-cmds/src/main/java/arq/wwwenc.java
+++ b/jena-cmds/src/main/java/arq/wwwenc.java
@@ -24,13 +24,13 @@ package arq;
import java.io.IOException;
import org.apache.jena.atlas.io.IO;
-import org.apache.jena.atlas.lib.StrUtils ;
+import org.apache.jena.atlas.lib.StrUtils;
public class wwwenc
{
/* http://en.wikipedia.org/wiki/Percent-encoding
* Reserved characters after percent-encoding
- * ! * " ' ( ) ; : @ & = + $ , / ? %
# [ ]
+ * ! * " ' ( ) ; : @ & = + $ , / ? % #
[ ]
* %21 %2A %22 %27 %28 %29 %3B %3A %40 %26 %3D %2B %24 %2C %2F %3F %25
%23 %5B %5D
* These loose any reserved meaning if encoded.
*
@@ -57,20 +57,20 @@ public class wwwenc
'*' , '+' , ',' , ';' , '=',
// general trouble
'<', '>', '{', '}', '|', '\\', '`', '^'
- } ;
+ };
if ( args.length == 0 ) {
String x = IO.readWholeFileAsUTF8(System.in);
- String y = StrUtils.encodeHex(x, '%', encode) ;
- System.out.println(y) ;
+ String y = StrUtils.encodeHex(x, '%', encode);
+ System.out.println(y);
return;
}
for ( String x : args) {
// Not URLEncoder which does www-form-encoding.
- String y = StrUtils.encodeHex(x, '%', encode) ;
- System.out.println(y) ;
-// String s2 = URLEncoder.encode(s, "utf-8") ;
-// System.out.println(s2) ;
+ String y = StrUtils.encodeHex(x, '%', encode);
+ System.out.println(y);
+// String s2 = URLEncoder.encode(s, "utf-8");
+// System.out.println(s2);
}
}
