You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2015/04/28 13:35:06 UTC
[4/6] jena git commit: JENA-923: Move className operations to
oaj.atlas.lib.Lib
JENA-923: Move className operations to oaj.atlas.lib.Lib
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/d93f2383
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/d93f2383
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/d93f2383
Branch: refs/heads/master
Commit: d93f238301cec9be8cd07669f8825f1cb1dca1ab
Parents: 57aa6ab
Author: Andy Seaborne <an...@apache.org>
Authored: Tue Apr 28 11:48:21 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Tue Apr 28 11:52:02 2015 +0100
----------------------------------------------------------------------
jena-arq/src/main/java/arq/cmdline/CmdARQ.java | 4 +-
jena-arq/src/main/java/arq/cmdline/CmdMain.java | 4 +-
jena-arq/src/main/java/arq/load.java | 4 +-
jena-arq/src/main/java/arq/qparse.java | 4 +-
jena-arq/src/main/java/arq/query.java | 4 +-
jena-arq/src/main/java/arq/sse.java | 4 +-
jena-arq/src/main/java/arq/sse_exec.java | 4 +-
jena-arq/src/main/java/arq/sse_query.java | 4 +-
jena-arq/src/main/java/arq/uparse.java | 4 +-
jena-arq/src/main/java/arq/update.java | 4 +-
.../jena/atlas/iterator/IteratorSlotted.java | 6 +-
.../atlas/iterator/RepeatApplyIterator.java | 4 +-
.../java/org/apache/jena/atlas/lib/Lib.java | 27 +-
.../java/org/apache/jena/riot/RDFDataMgr.java | 4 +-
.../apache/jena/riot/adapters/AdapterLib.java | 4 +-
.../jena/riot/tokens/TokenizerFactory.java | 2 +-
.../jena/sparql/algebra/AlgebraGenerator.java | 6 +-
.../org/apache/jena/sparql/engine/PlanOp.java | 4 +-
.../jena/sparql/engine/iterator/QueryIter1.java | 4 +-
.../jena/sparql/engine/iterator/QueryIter2.java | 4 +-
.../sparql/engine/iterator/QueryIterAssign.java | 4 +-
.../iterator/QueryIterAssignVarValue.java | 4 +-
.../engine/iterator/QueryIterBlockTriples.java | 4 +-
.../sparql/engine/iterator/QueryIterConcat.java | 8 +-
.../engine/iterator/QueryIterConvert.java | 4 +-
.../engine/iterator/QueryIterDefaulting.java | 4 +-
.../engine/iterator/QueryIterFilterExpr.java | 4 +-
.../engine/iterator/QueryIterNullIterator.java | 6 +-
.../sparql/engine/iterator/QueryIterPath.java | 4 +-
.../engine/iterator/QueryIterPlainWrapper.java | 4 +-
.../engine/iterator/QueryIterProcedure.java | 4 +-
.../iterator/QueryIterProcessBinding.java | 4 +-
.../engine/iterator/QueryIterProject.java | 4 +-
.../engine/iterator/QueryIterRepeatApply.java | 4 +-
.../sparql/engine/iterator/QueryIterYieldN.java | 4 +-
.../engine/iterator/QueryIteratorBase.java | 12 +-
.../engine/iterator/QueryIteratorCheck.java | 4 +-
.../engine/iterator/QueryIteratorResultSet.java | 4 +-
.../engine/iterator/QueryIteratorWrapper.java | 4 +-
.../engine/main/StageGeneratorGeneric.java | 4 +-
.../engine/main/iterator/QueryIterGraph.java | 4 +-
.../main/iterator/QueryIterOptionalIndex.java | 4 +-
.../engine/main/iterator/QueryIterUnion.java | 4 +-
.../jena/sparql/engine/ref/EvaluatorSimple.java | 4 +-
.../apache/jena/sparql/expr/ExprAggregator.java | 6 +-
.../org/apache/jena/sparql/expr/ExprSystem.java | 4 +-
.../jena/sparql/function/FunctionBase0.java | 8 +-
.../jena/sparql/function/FunctionBase1.java | 4 +-
.../jena/sparql/function/FunctionBase2.java | 8 +-
.../jena/sparql/function/FunctionBase3.java | 8 +-
.../jena/sparql/function/FunctionBase4.java | 8 +-
.../sparql/function/library/FN_StrConcat.java | 4 +-
.../function/library/FN_StrSubstring.java | 4 +-
.../jena/sparql/function/library/SystemVar.java | 4 +-
.../function/library/leviathan/cartesian.java | 4 +-
.../sparql/function/library/leviathan/log.java | 4 +-
.../sparql/function/library/leviathan/rnd.java | 4 +-
.../jena/sparql/function/library/strjoin.java | 6 +-
.../jena/sparql/function/library/substring.java | 4 +-
.../pfunction/PropertyFunctionFactoryAuto.java | 4 +-
.../jena/sparql/pfunction/library/splitIRI.java | 8 +-
.../jena/sparql/resultset/ResultSetMem.java | 4 +-
.../org/apache/jena/sparql/util/Loader.java | 3 +-
.../jena/sparql/util/PrintSerializableBase.java | 3 +-
.../jena/sparql/util/QueryOutputUtils.java | 3 +-
.../java/org/apache/jena/sparql/util/Utils.java | 18 +-
.../org/apache/jena/sparql/util/Version.java | 5 +-
jena-arq/src/main/java/riotcmd/dumpthrift.java | 4 +-
jena-arq/src/main/java/riotcmd/nquads.java | 4 +-
jena-arq/src/main/java/riotcmd/ntriples.java | 4 +-
jena-arq/src/main/java/riotcmd/rdfxml.java | 4 +-
jena-arq/src/main/java/riotcmd/riot.java | 4 +-
jena-arq/src/main/java/riotcmd/trig.java | 4 +-
jena-arq/src/main/java/riotcmd/turtle.java | 4 +-
jena-arq/src/test/java/arq/qtest.java | 4 +-
jena-arq/src/test/java/riotcmd/rdflangtest.java | 4 +-
.../graph/QueryIterPropertyTable.java | 14 +-
.../apache/jena/propertytable/lang/LangCSV.java | 2 +-
.../apache/jena/propertytable/util/IRILib.java | 264 -------------------
jena-csv/src/main/java/riotcmdx/csv2rdf.java | 4 +-
.../jena/fuseki/validation/DataValidator.java | 1 +
.../org/apache/jena/fuseki/http/TestHttpOp.java | 2 +-
.../org/apache/jena/tdb/index/ext/ExtHash.java | 4 +-
.../apache/jena/tdb/setup/StoreParamsCodec.java | 4 +-
.../org/apache/jena/tdb/sys/TDBInternal.java | 4 +-
jena-tdb/src/main/java/tdb/CmdRewriteIndex.java | 4 +-
jena-tdb/src/main/java/tdb/cmdline/CmdTDB.java | 4 +-
.../src/main/java/tdb/cmdline/CmdTDBGraph.java | 4 +-
jena-tdb/src/main/java/tdb/tools/dumpbpt.java | 4 +-
.../src/main/java/tdb/tools/dumpnodetable.java | 4 +-
.../src/main/java/tdb/tools/tdbgenindex.java | 4 +-
.../bplustree/CmdTestBPlusTreeRewriter.java | 4 +-
92 files changed, 226 insertions(+), 480 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/d93f2383/jena-arq/src/main/java/arq/cmdline/CmdARQ.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/arq/cmdline/CmdARQ.java b/jena-arq/src/main/java/arq/cmdline/CmdARQ.java
index de9b16f..1d2c826 100644
--- a/jena-arq/src/main/java/arq/cmdline/CmdARQ.java
+++ b/jena-arq/src/main/java/arq/cmdline/CmdARQ.java
@@ -18,10 +18,10 @@
package arq.cmdline;
+import org.apache.jena.atlas.lib.Lib ;
import org.apache.jena.query.ARQ ;
import org.apache.jena.riot.RIOT ;
import org.apache.jena.sparql.engine.iterator.QueryIteratorBase ;
-import org.apache.jena.sparql.util.Utils ;
public abstract class CmdARQ extends CmdGeneral
{
@@ -54,6 +54,6 @@ public abstract class CmdARQ extends CmdGeneral
@Override
protected String getCommandName()
{
- return Utils.className(this) ;
+ return Lib.className(this) ;
}
}
http://git-wip-us.apache.org/repos/asf/jena/blob/d93f2383/jena-arq/src/main/java/arq/cmdline/CmdMain.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/arq/cmdline/CmdMain.java b/jena-arq/src/main/java/arq/cmdline/CmdMain.java
index b197682..e127f68 100644
--- a/jena-arq/src/main/java/arq/cmdline/CmdMain.java
+++ b/jena-arq/src/main/java/arq/cmdline/CmdMain.java
@@ -18,9 +18,9 @@
package arq.cmdline;
+import org.apache.jena.atlas.lib.Lib ;
import org.apache.jena.atlas.logging.LogCtl ;
import org.apache.jena.shared.JenaException ;
-import org.apache.jena.sparql.util.Utils ;
import arq.cmd.CmdException ;
import arq.cmd.TerminationException ;
@@ -65,7 +65,7 @@ public abstract class CmdMain extends CmdLineArgs
{
ex.printStackTrace(System.err) ;
- String s = Utils.className(ex) ;
+ String s = Lib.className(ex) ;
// System.err.println(s) ;
// System.err.println(ex.getMessage()) ;
if ( exitOnFailure ) System.exit(2) ;
http://git-wip-us.apache.org/repos/asf/jena/blob/d93f2383/jena-arq/src/main/java/arq/load.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/arq/load.java b/jena-arq/src/main/java/arq/load.java
index e4a4e8d..45cdaf8 100644
--- a/jena-arq/src/main/java/arq/load.java
+++ b/jena-arq/src/main/java/arq/load.java
@@ -22,11 +22,11 @@ import java.util.Iterator ;
import java.util.List ;
import org.apache.jena.atlas.io.IndentedWriter ;
+import org.apache.jena.atlas.lib.Lib ;
import org.apache.jena.graph.Graph ;
import org.apache.jena.graph.Node ;
import org.apache.jena.sparql.modify.request.UpdateLoad ;
import org.apache.jena.sparql.sse.SSE ;
-import org.apache.jena.sparql.util.Utils ;
import org.apache.jena.sparql.util.graph.GraphLoadMonitor ;
import org.apache.jena.update.GraphStore ;
import org.apache.jena.update.UpdateExecutionFactory ;
@@ -67,7 +67,7 @@ public class load extends CmdUpdate
}
@Override
- protected String getCommandName() { return Utils.className(this) ; }
+ protected String getCommandName() { return Lib.className(this) ; }
@Override
protected String getSummary() { return getCommandName()+" --desc=assembler [--dump] --update=<request file>" ; }
http://git-wip-us.apache.org/repos/asf/jena/blob/d93f2383/jena-arq/src/main/java/arq/qparse.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/arq/qparse.java b/jena-arq/src/main/java/arq/qparse.java
index 12146a7..f9608af 100644
--- a/jena-arq/src/main/java/arq/qparse.java
+++ b/jena-arq/src/main/java/arq/qparse.java
@@ -21,6 +21,7 @@ package arq;
import java.io.PrintStream ;
import java.util.Iterator ;
+import org.apache.jena.atlas.lib.Lib ;
import org.apache.jena.atlas.logging.LogCtl ;
import org.apache.jena.query.* ;
import org.apache.jena.shared.JenaException ;
@@ -30,7 +31,6 @@ import org.apache.jena.sparql.lang.ParserBase ;
import org.apache.jena.sparql.resultset.ResultSetException ;
import org.apache.jena.sparql.util.QueryOutputUtils ;
import org.apache.jena.sparql.util.QueryUtils ;
-import org.apache.jena.sparql.util.Utils ;
import arq.cmd.CmdException ;
import arq.cmdline.ArgDecl ;
import arq.cmdline.CmdARQ ;
@@ -230,7 +230,7 @@ public class qparse extends CmdARQ
}
@Override
- protected String getCommandName() { return Utils.className(this) ; }
+ protected String getCommandName() { return Lib.className(this) ; }
// static String usage = qparse.class.getName()+
// " [--in syntax] [--out syntax] [\"query\" | --query <file>\n"+
http://git-wip-us.apache.org/repos/asf/jena/blob/d93f2383/jena-arq/src/main/java/arq/query.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/arq/query.java b/jena-arq/src/main/java/arq/query.java
index 91c56ef..912625b 100644
--- a/jena-arq/src/main/java/arq/query.java
+++ b/jena-arq/src/main/java/arq/query.java
@@ -19,6 +19,7 @@
package arq;
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.query.* ;
import org.apache.jena.riot.RiotException ;
@@ -29,7 +30,6 @@ 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.sparql.util.Utils ;
import arq.cmd.CmdException ;
import arq.cmd.TerminationException ;
import arq.cmdline.ArgDecl ;
@@ -166,7 +166,7 @@ public class query extends CmdARQ
}
@Override
- protected String getCommandName() { return Utils.className(this) ; }
+ protected String getCommandName() { return Lib.className(this) ; }
@Override
protected String getSummary() { return getCommandName()+" --data=<file> --query=<query>" ; }
http://git-wip-us.apache.org/repos/asf/jena/blob/d93f2383/jena-arq/src/main/java/arq/sse.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/arq/sse.java b/jena-arq/src/main/java/arq/sse.java
index 7480be7..7bc1146 100644
--- a/jena-arq/src/main/java/arq/sse.java
+++ b/jena-arq/src/main/java/arq/sse.java
@@ -19,12 +19,12 @@
package arq;
import org.apache.jena.atlas.io.IndentedWriter ;
+import org.apache.jena.atlas.lib.Lib ;
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.sparql.util.Utils ;
import arq.cmd.TerminationException ;
import arq.cmdline.ArgDecl ;
import arq.cmdline.CmdARQ_SSE ;
@@ -65,7 +65,7 @@ public class sse extends CmdARQ_SSE
}
@Override
- protected String getCommandName() { return Utils.className(this) ; }
+ protected String getCommandName() { return Lib.className(this) ; }
@Override
protected String getSummary() { return getCommandName() ; }
http://git-wip-us.apache.org/repos/asf/jena/blob/d93f2383/jena-arq/src/main/java/arq/sse_exec.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/arq/sse_exec.java b/jena-arq/src/main/java/arq/sse_exec.java
index ca8cbea..3b5f49c 100644
--- a/jena-arq/src/main/java/arq/sse_exec.java
+++ b/jena-arq/src/main/java/arq/sse_exec.java
@@ -18,9 +18,9 @@
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 org.apache.jena.sparql.util.Utils ;
import arq.cmdline.CmdARQ_SSE ;
public class sse_exec extends CmdARQ_SSE
@@ -37,7 +37,7 @@ public class sse_exec extends CmdARQ_SSE
}
@Override
- protected String getCommandName() { return Utils.className(this) ; }
+ protected String getCommandName() { return Lib.className(this) ; }
@Override
protected String getSummary() { return getCommandName()+" [--file<file> | string]" ; }
http://git-wip-us.apache.org/repos/asf/jena/blob/d93f2383/jena-arq/src/main/java/arq/sse_query.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/arq/sse_query.java b/jena-arq/src/main/java/arq/sse_query.java
index d1ec074..51eaa31 100644
--- a/jena-arq/src/main/java/arq/sse_query.java
+++ b/jena-arq/src/main/java/arq/sse_query.java
@@ -20,6 +20,7 @@ package arq;
import org.apache.jena.atlas.io.IndentedWriter ;
+import org.apache.jena.atlas.lib.Lib ;
import org.apache.jena.query.Dataset ;
import org.apache.jena.query.DatasetFactory ;
import org.apache.jena.sparql.algebra.Algebra ;
@@ -29,7 +30,6 @@ 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 org.apache.jena.sparql.util.Utils ;
import arq.cmd.CmdException ;
import arq.cmd.TerminationException ;
import arq.cmdline.ArgDecl ;
@@ -94,7 +94,7 @@ public class sse_query extends CmdARQ
}
@Override
- protected String getCommandName() { return Utils.className(this) ; }
+ protected String getCommandName() { return Lib.className(this) ; }
@Override
protected String getSummary() { return getCommandName()+" --data=<file> --query=<query>" ; }
http://git-wip-us.apache.org/repos/asf/jena/blob/d93f2383/jena-arq/src/main/java/arq/uparse.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/arq/uparse.java b/jena-arq/src/main/java/arq/uparse.java
index 44597e5..32d6d4d 100644
--- a/jena-arq/src/main/java/arq/uparse.java
+++ b/jena-arq/src/main/java/arq/uparse.java
@@ -22,10 +22,10 @@ import java.io.IOException ;
import java.util.List ;
import org.apache.jena.atlas.io.IndentedLineBuffer ;
+import org.apache.jena.atlas.lib.Lib ;
import org.apache.jena.query.QueryParseException ;
import org.apache.jena.query.Syntax ;
import org.apache.jena.sparql.modify.request.UpdateWriter ;
-import org.apache.jena.sparql.util.Utils ;
import org.apache.jena.update.UpdateFactory ;
import org.apache.jena.update.UpdateRequest ;
import org.apache.jena.util.FileUtils ;
@@ -85,7 +85,7 @@ public class uparse extends CmdARQ
}
@Override
- protected String getCommandName() { return Utils.className(this) ; }
+ protected String getCommandName() { return Lib.className(this) ; }
@Override
protected String getSummary() { return getCommandName()+" --file=<request file> | <update string>" ; }
http://git-wip-us.apache.org/repos/asf/jena/blob/d93f2383/jena-arq/src/main/java/arq/update.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/arq/update.java b/jena-arq/src/main/java/arq/update.java
index 07bff60..b93a597 100644
--- a/jena-arq/src/main/java/arq/update.java
+++ b/jena-arq/src/main/java/arq/update.java
@@ -20,13 +20,13 @@ package arq;
import java.util.List ;
+import org.apache.jena.atlas.lib.Lib ;
import org.apache.jena.query.ReadWrite ;
import org.apache.jena.riot.Lang ;
import org.apache.jena.riot.RDFDataMgr ;
import org.apache.jena.sparql.SystemARQ ;
import org.apache.jena.sparql.core.Transactional ;
import org.apache.jena.sparql.core.TransactionalNull ;
-import org.apache.jena.sparql.util.Utils ;
import org.apache.jena.update.GraphStore ;
import org.apache.jena.update.UpdateExecutionFactory ;
import org.apache.jena.update.UpdateFactory ;
@@ -63,7 +63,7 @@ public class update extends CmdUpdate
}
@Override
- protected String getCommandName() { return Utils.className(this) ; }
+ protected String getCommandName() { return Lib.className(this) ; }
@Override
protected String getSummary() { return getCommandName()+" --desc=assembler [--dump] --update=<request file>" ; }
http://git-wip-us.apache.org/repos/asf/jena/blob/d93f2383/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorSlotted.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorSlotted.java b/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorSlotted.java
index 0e8186d..fd846dc 100644
--- a/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorSlotted.java
+++ b/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorSlotted.java
@@ -21,7 +21,7 @@ package org.apache.jena.atlas.iterator;
import java.util.Iterator ;
import java.util.NoSuchElementException ;
-import org.apache.jena.sparql.util.Utils ;
+import org.apache.jena.atlas.lib.Lib ;
/** An Iterator with a one slot lookahead. */
public abstract class IteratorSlotted<T> implements Iterator<T>
@@ -77,7 +77,7 @@ public abstract class IteratorSlotted<T> implements Iterator<T>
@Override
public final T next()
{
- if ( ! hasNext() ) throw new NoSuchElementException(Utils.className(this)) ;
+ if ( ! hasNext() ) throw new NoSuchElementException(Lib.className(this)) ;
T obj = slot ;
slot = null ;
@@ -102,7 +102,7 @@ public abstract class IteratorSlotted<T> implements Iterator<T>
@Override
public final void remove()
{
- throw new UnsupportedOperationException(Utils.className(this)+".remove") ;
+ throw new UnsupportedOperationException(Lib.className(this)+".remove") ;
}
public final void close()
http://git-wip-us.apache.org/repos/asf/jena/blob/d93f2383/jena-arq/src/main/java/org/apache/jena/atlas/iterator/RepeatApplyIterator.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/atlas/iterator/RepeatApplyIterator.java b/jena-arq/src/main/java/org/apache/jena/atlas/iterator/RepeatApplyIterator.java
index 9aa00dd..e504265 100644
--- a/jena-arq/src/main/java/org/apache/jena/atlas/iterator/RepeatApplyIterator.java
+++ b/jena-arq/src/main/java/org/apache/jena/atlas/iterator/RepeatApplyIterator.java
@@ -22,7 +22,7 @@ import java.util.Iterator ;
import java.util.NoSuchElementException ;
import org.apache.jena.atlas.lib.Closeable ;
-import org.apache.jena.sparql.util.Utils ;
+import org.apache.jena.atlas.lib.Lib ;
public abstract class RepeatApplyIterator<T> implements Iterator<T>, Closeable
{
@@ -70,7 +70,7 @@ public abstract class RepeatApplyIterator<T> implements Iterator<T>, Closeable
public T next()
{
if ( ! hasNext() )
- throw new NoSuchElementException(Utils.className(this)+".next()/finished") ;
+ throw new NoSuchElementException(Lib.className(this)+".next()/finished") ;
return currentStage.next() ;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/d93f2383/jena-arq/src/main/java/org/apache/jena/atlas/lib/Lib.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/atlas/lib/Lib.java b/jena-arq/src/main/java/org/apache/jena/atlas/lib/Lib.java
index 982fcbe..6c9c442 100644
--- a/jena-arq/src/main/java/org/apache/jena/atlas/lib/Lib.java
+++ b/jena-arq/src/main/java/org/apache/jena/atlas/lib/Lib.java
@@ -61,21 +61,22 @@ public class Lib
return ! equal(obj1, obj2) ;
}
- static public final String className(Object obj)
- { return classShortName(obj.getClass()) ; }
-
- static public final String classShortName(Class<?> cls)
- {
+ /** Safely return the class short name for an object -- obj.getClass().getSimpleName() */
+ static public final String className(Object obj) {
+ if ( obj == null )
+ return "null" ;
+ return classShortName(obj.getClass()) ;
+ }
+
+ /** Safely return the class short name for a class */
+ static public final String classShortName(Class<? > cls) {
+ if ( cls == null )
+ return "null" ;
return cls.getSimpleName() ;
-// String tmp = cls.getName() ;
-// int i = tmp.lastIndexOf('.') ;
-// tmp = tmp.substring(i+1) ;
-// return tmp ;
}
-
- /** Do two lists have the same elements? */
- public static <T> boolean equalsListAsSet(List<T> list1, List<T> list2)
- {
+
+ /** Do two lists have the same elements? */
+ public static <T> boolean equalsListAsSet(List<T> list1, List<T> list2) {
if ( list1 == null && list2 == null )
return true ;
if ( list1 == null ) return false ;
http://git-wip-us.apache.org/repos/asf/jena/blob/d93f2383/jena-arq/src/main/java/org/apache/jena/riot/RDFDataMgr.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/RDFDataMgr.java b/jena-arq/src/main/java/org/apache/jena/riot/RDFDataMgr.java
index c199a11..64fa07f 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/RDFDataMgr.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/RDFDataMgr.java
@@ -22,6 +22,7 @@ import java.io.* ;
import java.util.Iterator ;
import org.apache.jena.atlas.io.IO ;
+import org.apache.jena.atlas.lib.Lib ;
import org.apache.jena.atlas.web.ContentType ;
import org.apache.jena.atlas.web.TypedInputStream ;
import org.apache.jena.graph.Graph ;
@@ -42,7 +43,6 @@ import org.apache.jena.sparql.core.Quad ;
import org.apache.jena.sparql.graph.GraphFactory ;
import org.apache.jena.sparql.util.Context ;
import org.apache.jena.sparql.util.Symbol ;
-import org.apache.jena.sparql.util.Utils ;
import org.slf4j.Logger ;
import org.slf4j.LoggerFactory ;
@@ -845,7 +845,7 @@ public class RDFDataMgr
{
try { sMgr = (StreamManager)context.get(streamManagerSymbol, context) ; }
catch (ClassCastException ex)
- { log.warn("Context symbol '"+streamManagerSymbol+"' is not a "+Utils.classShortName(StreamManager.class)) ; }
+ { log.warn("Context symbol '"+streamManagerSymbol+"' is not a "+Lib.classShortName(StreamManager.class)) ; }
}
return open(filenameOrURI, sMgr) ;
http://git-wip-us.apache.org/repos/asf/jena/blob/d93f2383/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterLib.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterLib.java b/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterLib.java
index 38664ec..19594d5 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterLib.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterLib.java
@@ -20,10 +20,10 @@ package org.apache.jena.riot.adapters ;
import java.util.Iterator ;
+import org.apache.jena.atlas.lib.Lib ;
import org.apache.jena.atlas.web.TypedInputStream ;
import org.apache.jena.riot.RiotException ;
import org.apache.jena.riot.system.stream.* ;
-import org.apache.jena.sparql.util.Utils ;
class AdapterLib {
public static org.apache.jena.util.TypedStream convert(TypedInputStream in) {
@@ -66,6 +66,6 @@ class AdapterLib {
return new LocatorZip(zipLoc.getZipFileName()) ;
}
- throw new RiotException("Unrecognized Locator: " + Utils.className(oldloc)) ;
+ throw new RiotException("Unrecognized Locator: " + Lib.className(oldloc)) ;
}
}
http://git-wip-us.apache.org/repos/asf/jena/blob/d93f2383/jena-arq/src/main/java/org/apache/jena/riot/tokens/TokenizerFactory.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/tokens/TokenizerFactory.java b/jena-arq/src/main/java/org/apache/jena/riot/tokens/TokenizerFactory.java
index 886bdbf..222eb5b 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/tokens/TokenizerFactory.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/tokens/TokenizerFactory.java
@@ -36,7 +36,7 @@ public class TokenizerFactory {
return tokenizer ;
}
- /** Discouraged - be careful about character sets */
+ /** Safe use of a StringReader */
public static Tokenizer makeTokenizer(StringReader reader) {
PeekReader peekReader = PeekReader.make(reader) ;
Tokenizer tokenizer = new TokenizerText(peekReader) ;
http://git-wip-us.apache.org/repos/asf/jena/blob/d93f2383/jena-arq/src/main/java/org/apache/jena/sparql/algebra/AlgebraGenerator.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/AlgebraGenerator.java b/jena-arq/src/main/java/org/apache/jena/sparql/algebra/AlgebraGenerator.java
index da7d729..6578ee7 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/AlgebraGenerator.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/algebra/AlgebraGenerator.java
@@ -20,6 +20,7 @@ package org.apache.jena.sparql.algebra;
import java.util.* ;
+import org.apache.jena.atlas.lib.Lib ;
import org.apache.jena.atlas.lib.Pair ;
import org.apache.jena.atlas.logging.Log ;
import org.apache.jena.graph.Node ;
@@ -36,7 +37,6 @@ import org.apache.jena.sparql.expr.* ;
import org.apache.jena.sparql.path.PathLib ;
import org.apache.jena.sparql.syntax.* ;
import org.apache.jena.sparql.util.Context ;
-import org.apache.jena.sparql.util.Utils ;
/**
* Class used to compile SPARQL queries into SPARQL algebra
@@ -153,7 +153,7 @@ public class AlgebraGenerator
if ( elt == null )
return OpNull.create() ;
- return compileUnknownElement(elt, "compile(Element)/Not a structural element: "+Utils.className(elt));
+ return compileUnknownElement(elt, "compile(Element)/Not a structural element: "+Lib.className(elt));
}
/**
@@ -417,7 +417,7 @@ public class AlgebraGenerator
// }
- return compileUnknownElement(elt, "compile/Element not recognized: "+Utils.className(elt));
+ return compileUnknownElement(elt, "compile/Element not recognized: "+Lib.className(elt));
}
protected Op compileElementUnion(ElementUnion el)
http://git-wip-us.apache.org/repos/asf/jena/blob/d93f2383/jena-arq/src/main/java/org/apache/jena/sparql/engine/PlanOp.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/PlanOp.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/PlanOp.java
index b277dd3..716dc53 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/PlanOp.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/PlanOp.java
@@ -20,10 +20,10 @@ package org.apache.jena.sparql.engine;
import org.apache.jena.atlas.io.IndentedWriter ;
import org.apache.jena.atlas.lib.Closeable ;
+import org.apache.jena.atlas.lib.Lib ;
import org.apache.jena.sparql.algebra.Op ;
import org.apache.jena.sparql.engine.iterator.QueryIteratorCloseable ;
import org.apache.jena.sparql.serializer.SerializationContext ;
-import org.apache.jena.sparql.util.Utils ;
public class PlanOp extends PlanBase
{
@@ -53,7 +53,7 @@ public class PlanOp extends PlanBase
{
if ( getOp() == null )
{
- out.println(Utils.className(this)) ;
+ out.println(Lib.className(this)) ;
return ;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/d93f2383/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIter1.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIter1.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIter1.java
index 86938a9..1e58da7 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIter1.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIter1.java
@@ -19,10 +19,10 @@
package org.apache.jena.sparql.engine.iterator;
import org.apache.jena.atlas.io.IndentedWriter ;
+import org.apache.jena.atlas.lib.Lib ;
import org.apache.jena.sparql.engine.ExecutionContext ;
import org.apache.jena.sparql.engine.QueryIterator ;
import org.apache.jena.sparql.serializer.SerializationContext ;
-import org.apache.jena.sparql.util.Utils ;
/**
* This class supports a QueryIter that takes one QueryIterator as input. */
@@ -81,7 +81,7 @@ public abstract class QueryIter1 extends QueryIter
protected void details(IndentedWriter out, SerializationContext sCxt)
{
- out.println(Utils.className(this)) ;
+ out.println(Lib.className(this)) ;
}
}
http://git-wip-us.apache.org/repos/asf/jena/blob/d93f2383/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIter2.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIter2.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIter2.java
index a6954f0..d017573 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIter2.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIter2.java
@@ -19,11 +19,11 @@
package org.apache.jena.sparql.engine.iterator;
import org.apache.jena.atlas.io.IndentedWriter ;
+import org.apache.jena.atlas.lib.Lib ;
import org.apache.jena.sparql.engine.ExecutionContext ;
import org.apache.jena.sparql.engine.Plan ;
import org.apache.jena.sparql.engine.QueryIterator ;
import org.apache.jena.sparql.serializer.SerializationContext ;
-import org.apache.jena.sparql.util.Utils ;
/**
* This class marks a QueryIter that takes two QueryIterators as input. */
@@ -71,7 +71,7 @@ public abstract class QueryIter2 extends QueryIter
@Override
public void output(IndentedWriter out, SerializationContext sCxt)
{
- out.println(Utils.className(this)) ;
+ out.println(Lib.className(this)) ;
out.incIndent() ;
out.print(Plan.startMarker) ;
http://git-wip-us.apache.org/repos/asf/jena/blob/d93f2383/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterAssign.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterAssign.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterAssign.java
index e1dc7b8..da903a2 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterAssign.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterAssign.java
@@ -19,6 +19,7 @@
package org.apache.jena.sparql.engine.iterator;
import org.apache.jena.atlas.io.IndentedWriter ;
+import org.apache.jena.atlas.lib.Lib ;
import org.apache.jena.graph.Node ;
import org.apache.jena.query.QueryExecException ;
import org.apache.jena.sparql.core.Var ;
@@ -30,7 +31,6 @@ import org.apache.jena.sparql.engine.binding.BindingFactory ;
import org.apache.jena.sparql.engine.binding.BindingMap ;
import org.apache.jena.sparql.expr.Expr ;
import org.apache.jena.sparql.serializer.SerializationContext ;
-import org.apache.jena.sparql.util.Utils ;
/** Extend each solution by a (var, expression) */
@@ -92,7 +92,7 @@ public class QueryIterAssign extends QueryIterProcessBinding
@Override
protected void details(IndentedWriter out, SerializationContext cxt)
{
- out.print(Utils.className(this)) ;
+ out.print(Lib.className(this)) ;
out.print(" ") ;
out.print(exprs.toString()) ;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/d93f2383/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterAssignVarValue.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterAssignVarValue.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterAssignVarValue.java
index 3c4f8a4..dc28a18 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterAssignVarValue.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterAssignVarValue.java
@@ -19,6 +19,7 @@
package org.apache.jena.sparql.engine.iterator;
import org.apache.jena.atlas.io.IndentedWriter ;
+import org.apache.jena.atlas.lib.Lib ;
import org.apache.jena.graph.Node ;
import org.apache.jena.query.QueryExecException ;
import org.apache.jena.sparql.core.Var ;
@@ -28,7 +29,6 @@ import org.apache.jena.sparql.engine.binding.Binding ;
import org.apache.jena.sparql.engine.binding.BindingFactory ;
import org.apache.jena.sparql.serializer.SerializationContext ;
import org.apache.jena.sparql.util.FmtUtils ;
-import org.apache.jena.sparql.util.Utils ;
/** Extend each solution by a (var, node)
* When used with mustBeNewVar=false, this is a join.
@@ -77,7 +77,7 @@ public class QueryIterAssignVarValue extends QueryIterProcessBinding
@Override
protected void details(IndentedWriter out, SerializationContext cxt)
{
- out.print(Utils.className(this)) ;
+ out.print(Lib.className(this)) ;
out.print(" ?"+var.toString()+" = "+FmtUtils.stringForNode(node, cxt)) ;
}
}
http://git-wip-us.apache.org/repos/asf/jena/blob/d93f2383/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterBlockTriples.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterBlockTriples.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterBlockTriples.java
index e3f5ef3..a0f2a96 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterBlockTriples.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterBlockTriples.java
@@ -20,6 +20,7 @@ package org.apache.jena.sparql.engine.iterator;
import org.apache.jena.atlas.io.IndentedWriter ;
+import org.apache.jena.atlas.lib.Lib ;
import org.apache.jena.graph.Graph ;
import org.apache.jena.graph.Triple ;
import org.apache.jena.sparql.core.BasicPattern ;
@@ -28,7 +29,6 @@ import org.apache.jena.sparql.engine.QueryIterator ;
import org.apache.jena.sparql.engine.binding.Binding ;
import org.apache.jena.sparql.serializer.SerializationContext ;
import org.apache.jena.sparql.util.FmtUtils ;
-import org.apache.jena.sparql.util.Utils ;
public class QueryIterBlockTriples extends QueryIter1
{
@@ -87,7 +87,7 @@ public class QueryIterBlockTriples extends QueryIter1
@Override
protected void details(IndentedWriter out, SerializationContext sCxt)
{
- out.print(Utils.className(this)) ;
+ out.print(Lib.className(this)) ;
out.println() ;
out.incIndent() ;
FmtUtils.formatPattern(out, pattern, sCxt) ;
http://git-wip-us.apache.org/repos/asf/jena/blob/d93f2383/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterConcat.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterConcat.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterConcat.java
index 4d18aa7..e304b0d 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterConcat.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterConcat.java
@@ -24,11 +24,11 @@ import java.util.List ;
import java.util.NoSuchElementException ;
import org.apache.jena.atlas.io.IndentedWriter ;
+import org.apache.jena.atlas.lib.Lib ;
import org.apache.jena.sparql.engine.ExecutionContext ;
import org.apache.jena.sparql.engine.QueryIterator ;
import org.apache.jena.sparql.engine.binding.Binding ;
import org.apache.jena.sparql.serializer.SerializationContext ;
-import org.apache.jena.sparql.util.Utils ;
/**
@@ -101,9 +101,9 @@ public class QueryIterConcat extends QueryIter
protected Binding moveToNextBinding()
{
if ( ! hasNextBinding() )
- throw new NoSuchElementException(Utils.className(this)) ;
+ throw new NoSuchElementException(Lib.className(this)) ;
if ( currentQIter == null )
- throw new NoSuchElementException(Utils.className(this)) ;
+ throw new NoSuchElementException(Lib.className(this)) ;
Binding binding = currentQIter.nextBinding() ;
return binding ;
@@ -131,7 +131,7 @@ public class QueryIterConcat extends QueryIter
@Override
public void output(IndentedWriter out, SerializationContext sCxt)
{
- out.println(Utils.className(this)) ;
+ out.println(Lib.className(this)) ;
out.incIndent() ;
for ( QueryIterator qIter : iteratorList )
{
http://git-wip-us.apache.org/repos/asf/jena/blob/d93f2383/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterConvert.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterConvert.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterConvert.java
index f128b6e..9c71783 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterConvert.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterConvert.java
@@ -19,11 +19,11 @@
package org.apache.jena.sparql.engine.iterator;
import org.apache.jena.atlas.io.IndentedWriter ;
+import org.apache.jena.atlas.lib.Lib ;
import org.apache.jena.sparql.engine.ExecutionContext ;
import org.apache.jena.sparql.engine.QueryIterator ;
import org.apache.jena.sparql.engine.binding.Binding ;
import org.apache.jena.sparql.serializer.SerializationContext ;
-import org.apache.jena.sparql.util.Utils ;
/** Iterator over another QueryIterator, applying a converter function
@@ -67,6 +67,6 @@ public class QueryIterConvert extends QueryIter1
@Override
protected void details(IndentedWriter out, SerializationContext cxt)
{
- out.println(Utils.className(this)) ;
+ out.println(Lib.className(this)) ;
}
}
http://git-wip-us.apache.org/repos/asf/jena/blob/d93f2383/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterDefaulting.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterDefaulting.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterDefaulting.java
index cc1242c..1e08bc1 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterDefaulting.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterDefaulting.java
@@ -20,10 +20,10 @@ package org.apache.jena.sparql.engine.iterator;
import java.util.NoSuchElementException ;
+import org.apache.jena.atlas.lib.Lib ;
import org.apache.jena.sparql.engine.ExecutionContext ;
import org.apache.jena.sparql.engine.QueryIterator ;
import org.apache.jena.sparql.engine.binding.Binding ;
-import org.apache.jena.sparql.util.Utils ;
/** An iterator that returns at least one element from another iterator
* or a default value (once) if the wrapped iterator returns nothing. */
@@ -67,7 +67,7 @@ public class QueryIterDefaulting extends QueryIterSub
protected Binding moveToNextBinding()
{
if ( isFinished() )
- throw new NoSuchElementException(Utils.className(this)) ;
+ throw new NoSuchElementException(Lib.className(this)) ;
if ( returnDefaultObject )
{
http://git-wip-us.apache.org/repos/asf/jena/blob/d93f2383/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterFilterExpr.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterFilterExpr.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterFilterExpr.java
index 9560817..f4397b2 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterFilterExpr.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterFilterExpr.java
@@ -19,6 +19,7 @@
package org.apache.jena.sparql.engine.iterator;
import org.apache.jena.atlas.io.IndentedWriter ;
+import org.apache.jena.atlas.lib.Lib ;
import org.apache.jena.atlas.logging.Log ;
import org.apache.jena.sparql.engine.ExecutionContext ;
import org.apache.jena.sparql.engine.QueryIterator ;
@@ -27,7 +28,6 @@ import org.apache.jena.sparql.expr.Expr ;
import org.apache.jena.sparql.expr.ExprException ;
import org.apache.jena.sparql.serializer.SerializationContext ;
import org.apache.jena.sparql.util.ExprUtils ;
-import org.apache.jena.sparql.util.Utils ;
/**
* Filter a stream of bindings by a constraint. */
@@ -64,7 +64,7 @@ public class QueryIterFilterExpr extends QueryIterProcessBinding
@Override
protected void details(IndentedWriter out, SerializationContext cxt)
{
- out.print(Utils.className(this)) ;
+ out.print(Lib.className(this)) ;
out.print(" ") ;
ExprUtils.fmtSPARQL(out, expr, cxt) ;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/d93f2383/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterNullIterator.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterNullIterator.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterNullIterator.java
index 6bddc62..dd5958e 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterNullIterator.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterNullIterator.java
@@ -21,11 +21,11 @@ package org.apache.jena.sparql.engine.iterator;
import java.util.NoSuchElementException ;
import org.apache.jena.atlas.io.IndentedWriter ;
+import org.apache.jena.atlas.lib.Lib ;
import org.apache.jena.sparql.engine.ExecutionContext ;
import org.apache.jena.sparql.engine.QueryIterator ;
import org.apache.jena.sparql.engine.binding.Binding ;
import org.apache.jena.sparql.serializer.SerializationContext ;
-import org.apache.jena.sparql.util.Utils ;
/** Closeable empty query iterator */
@@ -44,7 +44,7 @@ public class QueryIterNullIterator extends QueryIter
@Override
protected Binding moveToNextBinding()
- { throw new NoSuchElementException(Utils.className(this)) ; }
+ { throw new NoSuchElementException(Lib.className(this)) ; }
@Override
protected void closeIterator() {}
@@ -54,5 +54,5 @@ public class QueryIterNullIterator extends QueryIter
@Override
public void output(IndentedWriter out, SerializationContext sCxt)
- { out.println(Utils.className(this)) ; }
+ { out.println(Lib.className(this)) ; }
}
http://git-wip-us.apache.org/repos/asf/jena/blob/d93f2383/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterPath.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterPath.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterPath.java
index 907e4dc..4a4668f 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterPath.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterPath.java
@@ -19,6 +19,7 @@
package org.apache.jena.sparql.engine.iterator;
import org.apache.jena.atlas.io.IndentedWriter ;
+import org.apache.jena.atlas.lib.Lib ;
import org.apache.jena.sparql.core.TriplePath ;
import org.apache.jena.sparql.core.Var ;
import org.apache.jena.sparql.engine.ExecutionContext ;
@@ -26,7 +27,6 @@ import org.apache.jena.sparql.engine.QueryIterator ;
import org.apache.jena.sparql.engine.binding.Binding ;
import org.apache.jena.sparql.path.PathLib ;
import org.apache.jena.sparql.serializer.SerializationContext ;
-import org.apache.jena.sparql.util.Utils ;
public class QueryIterPath extends QueryIterRepeatApply
{
@@ -51,7 +51,7 @@ public class QueryIterPath extends QueryIterRepeatApply
@Override
protected void details(IndentedWriter out, SerializationContext sCxt)
{
- out.print(Utils.className(this)) ;
+ out.print(Lib.className(this)) ;
out.println() ;
out.incIndent() ;
out.print(triplePath.toString()) ;
http://git-wip-us.apache.org/repos/asf/jena/blob/d93f2383/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterPlainWrapper.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterPlainWrapper.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterPlainWrapper.java
index 682c8c5..5995123 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterPlainWrapper.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterPlainWrapper.java
@@ -22,10 +22,10 @@ import java.util.Iterator ;
import org.apache.jena.atlas.io.IndentedWriter ;
import org.apache.jena.atlas.iterator.Iter ;
+import org.apache.jena.atlas.lib.Lib ;
import org.apache.jena.sparql.engine.ExecutionContext ;
import org.apache.jena.sparql.engine.binding.Binding ;
import org.apache.jena.sparql.serializer.SerializationContext ;
-import org.apache.jena.sparql.util.Utils ;
import org.apache.jena.util.iterator.NiceIterator ;
/** Turn an normal java.util.Iterator (of Bindings) into a QueryIterator */
@@ -73,5 +73,5 @@ public class QueryIterPlainWrapper extends QueryIter
@Override
public void output(IndentedWriter out, SerializationContext sCxt)
- { out.print(Utils.className(this)) ; }
+ { out.print(Lib.className(this)) ; }
}
http://git-wip-us.apache.org/repos/asf/jena/blob/d93f2383/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterProcedure.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterProcedure.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterProcedure.java
index 7ecbf0a..eaf6da1 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterProcedure.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterProcedure.java
@@ -19,12 +19,12 @@
package org.apache.jena.sparql.engine.iterator;
import org.apache.jena.atlas.io.IndentedWriter ;
+import org.apache.jena.atlas.lib.Lib ;
import org.apache.jena.sparql.engine.ExecutionContext ;
import org.apache.jena.sparql.engine.QueryIterator ;
import org.apache.jena.sparql.engine.binding.Binding ;
import org.apache.jena.sparql.procedure.Procedure ;
import org.apache.jena.sparql.serializer.SerializationContext ;
-import org.apache.jena.sparql.util.Utils ;
/** QueryIterator for a procedure. Delays first touch until first call because
* first touch may cause work to be done.
@@ -83,7 +83,7 @@ public class QueryIterProcedure extends QueryIter1
@Override
protected void details(IndentedWriter out, SerializationContext sCxt)
{
- out.print(Utils.className(this)) ;
+ out.print(Lib.className(this)) ;
out.print(" ") ;
proc.output(out, sCxt) ;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/d93f2383/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterProcessBinding.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterProcessBinding.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterProcessBinding.java
index b754f36..7f528bf 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterProcessBinding.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterProcessBinding.java
@@ -20,11 +20,11 @@ package org.apache.jena.sparql.engine.iterator ;
import java.util.NoSuchElementException ;
+import org.apache.jena.atlas.lib.Lib ;
import org.apache.jena.sparql.ARQInternalErrorException ;
import org.apache.jena.sparql.engine.ExecutionContext ;
import org.apache.jena.sparql.engine.QueryIterator ;
import org.apache.jena.sparql.engine.binding.Binding ;
-import org.apache.jena.sparql.util.Utils ;
/**
* An iterator that applies a condition. The condition may return a different
@@ -61,7 +61,7 @@ public abstract class QueryIterProcessBinding extends QueryIter1 {
// Null iterator.
if ( getInput() == null )
- throw new ARQInternalErrorException(Utils.className(this) + ": Null iterator") ;
+ throw new ARQInternalErrorException(Lib.className(this) + ": Null iterator") ;
while (getInput().hasNext()) {
// Skip forward until a binding to return is found.
http://git-wip-us.apache.org/repos/asf/jena/blob/d93f2383/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterProject.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterProject.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterProject.java
index f8cbc78..48713ba 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterProject.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterProject.java
@@ -21,6 +21,7 @@ package org.apache.jena.sparql.engine.iterator;
import java.util.List ;
import org.apache.jena.atlas.io.IndentedWriter ;
+import org.apache.jena.atlas.lib.Lib ;
import org.apache.jena.atlas.lib.ListUtils ;
import org.apache.jena.sparql.core.Var ;
import org.apache.jena.sparql.engine.ExecutionContext ;
@@ -28,7 +29,6 @@ import org.apache.jena.sparql.engine.QueryIterator ;
import org.apache.jena.sparql.engine.binding.Binding ;
import org.apache.jena.sparql.engine.binding.BindingProject ;
import org.apache.jena.sparql.serializer.SerializationContext ;
-import org.apache.jena.sparql.util.Utils ;
public class QueryIterProject extends QueryIterConvert
@@ -51,7 +51,7 @@ public class QueryIterProject extends QueryIterConvert
@Override
protected void details(IndentedWriter out, SerializationContext sCxt)
{
- out.print(Utils.className(this)) ;
+ out.print(Lib.className(this)) ;
out.print(" ") ;
ListUtils.print(out, projectionVars) ;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/d93f2383/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterRepeatApply.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterRepeatApply.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterRepeatApply.java
index 08728b5..d564ce6 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterRepeatApply.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterRepeatApply.java
@@ -19,11 +19,11 @@
package org.apache.jena.sparql.engine.iterator;
import java.util.NoSuchElementException ;
+import org.apache.jena.atlas.lib.Lib ;
import org.apache.jena.atlas.logging.Log ;
import org.apache.jena.sparql.engine.ExecutionContext ;
import org.apache.jena.sparql.engine.QueryIterator ;
import org.apache.jena.sparql.engine.binding.Binding ;
-import org.apache.jena.sparql.util.Utils ;
/** Repeatedly execute the subclass operation for each Binding in the input iterator. */
@@ -86,7 +86,7 @@ public abstract class QueryIterRepeatApply extends QueryIter1
protected Binding moveToNextBinding()
{
if ( ! hasNextBinding() )
- throw new NoSuchElementException(Utils.className(this)+".next()/finished") ;
+ throw new NoSuchElementException(Lib.className(this)+".next()/finished") ;
return currentStage.nextBinding() ;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/d93f2383/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterYieldN.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterYieldN.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterYieldN.java
index c1f65fa..b3af4e9 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterYieldN.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterYieldN.java
@@ -21,10 +21,10 @@ package org.apache.jena.sparql.engine.iterator;
import java.util.NoSuchElementException ;
import org.apache.jena.atlas.io.IndentedWriter ;
+import org.apache.jena.atlas.lib.Lib ;
import org.apache.jena.sparql.engine.ExecutionContext ;
import org.apache.jena.sparql.engine.binding.Binding ;
import org.apache.jena.sparql.serializer.SerializationContext ;
-import org.apache.jena.sparql.util.Utils ;
/** A query iterator that yields the same thing N times. */
@@ -59,7 +59,7 @@ public class QueryIterYieldN extends QueryIter
{
if ( ! hasNextBinding() )
// Try to get the class name as specific as possible for subclasses
- throw new NoSuchElementException(Utils.className(this)) ;
+ throw new NoSuchElementException(Lib.className(this)) ;
countYielded++ ;
return binding ;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/d93f2383/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIteratorBase.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIteratorBase.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIteratorBase.java
index fd28568..dee0661 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIteratorBase.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIteratorBase.java
@@ -20,6 +20,7 @@ package org.apache.jena.sparql.engine.iterator;
import java.util.NoSuchElementException ;
+import org.apache.jena.atlas.lib.Lib ;
import org.apache.jena.atlas.logging.Log ;
import org.apache.jena.query.QueryCancelledException ;
import org.apache.jena.query.QueryException ;
@@ -27,7 +28,6 @@ import org.apache.jena.query.QueryFatalException ;
import org.apache.jena.sparql.engine.QueryIterator ;
import org.apache.jena.sparql.engine.binding.Binding ;
import org.apache.jena.sparql.util.PrintSerializableBase ;
-import org.apache.jena.sparql.util.Utils ;
/**
* This class provides the general machinary for iterators. This includes:
@@ -145,14 +145,14 @@ public abstract class QueryIteratorBase
}
if ( finished )
- throw new NoSuchElementException(Utils.className(this)) ;
+ throw new NoSuchElementException(Lib.className(this)) ;
if ( ! hasNextBinding() )
- throw new NoSuchElementException(Utils.className(this)) ;
+ throw new NoSuchElementException(Lib.className(this)) ;
Binding obj = moveToNextBinding() ;
if ( obj == null )
- throw new NoSuchElementException(Utils.className(this)) ;
+ throw new NoSuchElementException(Lib.className(this)) ;
if ( shouldCancel && ! finished )
{
@@ -172,8 +172,8 @@ public abstract class QueryIteratorBase
@Override
public final void remove()
{
- Log.warn(this, "Call to QueryIterator.remove() : "+Utils.className(this)+".remove") ;
- throw new UnsupportedOperationException(Utils.className(this)+".remove") ;
+ Log.warn(this, "Call to QueryIterator.remove() : "+Lib.className(this)+".remove") ;
+ throw new UnsupportedOperationException(Lib.className(this)+".remove") ;
}
@Override
http://git-wip-us.apache.org/repos/asf/jena/blob/d93f2383/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIteratorCheck.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIteratorCheck.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIteratorCheck.java
index cb610ce..9e784c3 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIteratorCheck.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIteratorCheck.java
@@ -21,11 +21,11 @@ package org.apache.jena.sparql.engine.iterator;
import java.util.Iterator ;
import org.apache.jena.atlas.io.IndentedWriter ;
+import org.apache.jena.atlas.lib.Lib ;
import org.apache.jena.atlas.logging.Log ;
import org.apache.jena.sparql.engine.ExecutionContext ;
import org.apache.jena.sparql.engine.QueryIterator ;
import org.apache.jena.sparql.serializer.SerializationContext ;
-import org.apache.jena.sparql.util.Utils ;
/** Query iterator that checks everything was closed correctly */
@@ -89,7 +89,7 @@ public class QueryIteratorCheck extends QueryIteratorWrapper
private static void warn(QueryIterator qIter, String str)
{
- str = str + Utils.className(qIter) ;
+ str = str + Lib.className(qIter) ;
if ( qIter instanceof QueryIteratorBase )
{
http://git-wip-us.apache.org/repos/asf/jena/blob/d93f2383/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIteratorResultSet.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIteratorResultSet.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIteratorResultSet.java
index be3aa5d..82bfff1 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIteratorResultSet.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIteratorResultSet.java
@@ -19,10 +19,10 @@
package org.apache.jena.sparql.engine.iterator;
import org.apache.jena.atlas.io.IndentedWriter ;
+import org.apache.jena.atlas.lib.Lib ;
import org.apache.jena.query.ResultSet ;
import org.apache.jena.sparql.engine.binding.Binding ;
import org.apache.jena.sparql.serializer.SerializationContext ;
-import org.apache.jena.sparql.util.Utils ;
public class QueryIteratorResultSet extends QueryIteratorBase
{
@@ -41,6 +41,6 @@ public class QueryIteratorResultSet extends QueryIteratorBase
@Override
public void output(IndentedWriter out, SerializationContext cxt)
{
- out.print(Utils.className(this)) ;
+ out.print(Lib.className(this)) ;
}
}
http://git-wip-us.apache.org/repos/asf/jena/blob/d93f2383/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIteratorWrapper.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIteratorWrapper.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIteratorWrapper.java
index 7703a97..9fda84e 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIteratorWrapper.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIteratorWrapper.java
@@ -19,10 +19,10 @@
package org.apache.jena.sparql.engine.iterator;
import org.apache.jena.atlas.io.IndentedWriter ;
+import org.apache.jena.atlas.lib.Lib ;
import org.apache.jena.sparql.engine.QueryIterator ;
import org.apache.jena.sparql.engine.binding.Binding ;
import org.apache.jena.sparql.serializer.SerializationContext ;
-import org.apache.jena.sparql.util.Utils ;
/** Wrap a QueryIterator so it can have some/all of it's methods intercepted. */
@@ -63,7 +63,7 @@ public class QueryIteratorWrapper extends QueryIteratorBase
@Override
public void output(IndentedWriter out, SerializationContext sCxt)
{
- out.println(Utils.className(this)+"/"+Utils.className(iterator)) ;
+ out.println(Lib.className(this)+"/"+Lib.className(iterator)) ;
out.incIndent() ;
iterator.output(out, sCxt) ;
out.decIndent() ;
http://git-wip-us.apache.org/repos/asf/jena/blob/d93f2383/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/StageGeneratorGeneric.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/StageGeneratorGeneric.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/StageGeneratorGeneric.java
index 36e71ce..edc1fd3 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/StageGeneratorGeneric.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/StageGeneratorGeneric.java
@@ -18,6 +18,7 @@
package org.apache.jena.sparql.engine.main;
+import org.apache.jena.atlas.lib.Lib ;
import org.apache.jena.atlas.logging.Log ;
import org.apache.jena.graph.Graph ;
import org.apache.jena.sparql.core.BasicPattern ;
@@ -32,7 +33,6 @@ import org.apache.jena.sparql.engine.optimizer.reorder.ReorderLib ;
import org.apache.jena.sparql.engine.optimizer.reorder.ReorderProc ;
import org.apache.jena.sparql.engine.optimizer.reorder.ReorderTransformation ;
import org.apache.jena.sparql.mgt.Explain ;
-import org.apache.jena.sparql.util.Utils ;
/** Generic - always works - StageGenerator */
public class StageGeneratorGeneric implements StageGenerator {
@@ -42,7 +42,7 @@ public class StageGeneratorGeneric implements StageGenerator {
@Override
public QueryIterator execute(BasicPattern pattern, QueryIterator input, ExecutionContext execCxt) {
if ( input == null )
- Log.fatal(this, "Null input to " + Utils.classShortName(this.getClass())) ;
+ Log.fatal(this, "Null input to " + Lib.classShortName(this.getClass())) ;
Graph graph = execCxt.getActiveGraph() ;
http://git-wip-us.apache.org/repos/asf/jena/blob/d93f2383/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/iterator/QueryIterGraph.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/iterator/QueryIterGraph.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/iterator/QueryIterGraph.java
index 2743ecb..15e697f 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/iterator/QueryIterGraph.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/iterator/QueryIterGraph.java
@@ -23,6 +23,7 @@ import java.util.NoSuchElementException ;
import org.apache.jena.atlas.iterator.Iter ;
import org.apache.jena.atlas.iterator.SingletonIterator ;
+import org.apache.jena.atlas.lib.Lib ;
import org.apache.jena.graph.Graph ;
import org.apache.jena.graph.Node ;
import org.apache.jena.sparql.ARQInternalErrorException ;
@@ -39,7 +40,6 @@ import org.apache.jena.sparql.engine.iterator.QueryIterRepeatApply ;
import org.apache.jena.sparql.engine.iterator.QueryIterSingleton ;
import org.apache.jena.sparql.engine.iterator.QueryIterSub ;
import org.apache.jena.sparql.engine.main.QC ;
-import org.apache.jena.sparql.util.Utils ;
public class QueryIterGraph extends QueryIterRepeatApply
{
@@ -133,7 +133,7 @@ public class QueryIterGraph extends QueryIterRepeatApply
protected Binding moveToNextBinding()
{
if ( iter == null )
- throw new NoSuchElementException(Utils.className(this)+".moveToNextBinding") ;
+ throw new NoSuchElementException(Lib.className(this)+".moveToNextBinding") ;
return iter.nextBinding() ;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/d93f2383/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/iterator/QueryIterOptionalIndex.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/iterator/QueryIterOptionalIndex.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/iterator/QueryIterOptionalIndex.java
index 55aecdf..643b66c 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/iterator/QueryIterOptionalIndex.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/iterator/QueryIterOptionalIndex.java
@@ -19,6 +19,7 @@
package org.apache.jena.sparql.engine.main.iterator;
import org.apache.jena.atlas.io.IndentedWriter ;
+import org.apache.jena.atlas.lib.Lib ;
import org.apache.jena.sparql.algebra.Op ;
import org.apache.jena.sparql.engine.ExecutionContext ;
import org.apache.jena.sparql.engine.QueryIterator ;
@@ -28,7 +29,6 @@ import org.apache.jena.sparql.engine.iterator.QueryIterRepeatApply ;
import org.apache.jena.sparql.engine.iterator.QueryIterSingleton ;
import org.apache.jena.sparql.engine.main.QC ;
import org.apache.jena.sparql.serializer.SerializationContext ;
-import org.apache.jena.sparql.util.Utils ;
@@ -56,7 +56,7 @@ public class QueryIterOptionalIndex extends QueryIterRepeatApply
@Override
protected void details(IndentedWriter out, SerializationContext sCxt)
{
- out.println(Utils.className(this)) ;
+ out.println(Lib.className(this)) ;
out.incIndent() ;
op.output(out, sCxt) ;
out.decIndent() ;
http://git-wip-us.apache.org/repos/asf/jena/blob/d93f2383/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/iterator/QueryIterUnion.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/iterator/QueryIterUnion.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/iterator/QueryIterUnion.java
index 9523bd0..b22c7b3 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/iterator/QueryIterUnion.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/main/iterator/QueryIterUnion.java
@@ -21,6 +21,7 @@ package org.apache.jena.sparql.engine.main.iterator;
import java.util.List ;
import org.apache.jena.atlas.io.IndentedWriter ;
+import org.apache.jena.atlas.lib.Lib ;
import org.apache.jena.sparql.algebra.Op ;
import org.apache.jena.sparql.engine.ExecutionContext ;
import org.apache.jena.sparql.engine.QueryIterator ;
@@ -30,7 +31,6 @@ import org.apache.jena.sparql.engine.iterator.QueryIterRepeatApply ;
import org.apache.jena.sparql.engine.iterator.QueryIterSingleton ;
import org.apache.jena.sparql.engine.main.QC ;
import org.apache.jena.sparql.serializer.SerializationContext ;
-import org.apache.jena.sparql.util.Utils ;
/** Execute each sub stage against the input.
@@ -66,7 +66,7 @@ public class QueryIterUnion extends QueryIterRepeatApply
@Override
public void output(IndentedWriter out, SerializationContext sCxt)
{
- out.println(Utils.className(this)) ;
+ out.println(Lib.className(this)) ;
out.incIndent() ;
for (Op op : subOps)
op.output(out, sCxt) ;
http://git-wip-us.apache.org/repos/asf/jena/blob/d93f2383/jena-arq/src/main/java/org/apache/jena/sparql/engine/ref/EvaluatorSimple.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/ref/EvaluatorSimple.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/ref/EvaluatorSimple.java
index db00ddd..d79fe12 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/ref/EvaluatorSimple.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/ref/EvaluatorSimple.java
@@ -21,6 +21,7 @@ package org.apache.jena.sparql.engine.ref;
import java.util.ArrayList ;
import java.util.List ;
+import org.apache.jena.atlas.lib.Lib ;
import org.apache.jena.graph.Node ;
import org.apache.jena.query.ResultSet ;
import org.apache.jena.query.ResultSetFormatter ;
@@ -43,7 +44,6 @@ import org.apache.jena.sparql.expr.ExprList ;
import org.apache.jena.sparql.pfunction.PropFuncArg ;
import org.apache.jena.sparql.procedure.ProcEval ;
import org.apache.jena.sparql.procedure.Procedure ;
-import org.apache.jena.sparql.util.Utils ;
public class EvaluatorSimple implements Evaluator
{
@@ -335,7 +335,7 @@ public class EvaluatorSimple implements Evaluator
private static void dump(Table table)
{
- System.out.println("Table: "+Utils.className(table)) ;
+ System.out.println("Table: "+Lib.className(table)) ;
QueryIterator qIter = table.iterator(null) ;
ResultSet rs = new ResultSetStream(table.getVarNames(), null, table.iterator(null)) ;
ResultSetFormatter.out(rs) ;
http://git-wip-us.apache.org/repos/asf/jena/blob/d93f2383/jena-arq/src/main/java/org/apache/jena/sparql/expr/ExprAggregator.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/ExprAggregator.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/ExprAggregator.java
index 1b110c5..8db9b01 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/ExprAggregator.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/ExprAggregator.java
@@ -19,6 +19,7 @@
package org.apache.jena.sparql.expr;
import static org.apache.jena.atlas.lib.Lib.equal ;
+import org.apache.jena.atlas.lib.Lib ;
import org.apache.jena.atlas.logging.Log ;
import org.apache.jena.graph.Node ;
import org.apache.jena.sparql.ARQInternalErrorException ;
@@ -28,7 +29,6 @@ import org.apache.jena.sparql.expr.aggregate.Aggregator ;
import org.apache.jena.sparql.function.FunctionEnv ;
import org.apache.jena.sparql.graph.NodeTransform ;
import org.apache.jena.sparql.serializer.SerializationContext ;
-import org.apache.jena.sparql.util.Utils ;
/** Group aggregation functions calculated a value during grouping and
* placed in the output binding. This class is relationship of
@@ -48,9 +48,9 @@ public class ExprAggregator extends ExprNode
public void setVar(Var v)
{
if (this.var != null)
- throw new ARQInternalErrorException(Utils.className(this)+ ": Attempt to set variable to " + v + " when already set as " + this.var) ;
+ throw new ARQInternalErrorException(Lib.className(this)+ ": Attempt to set variable to " + v + " when already set as " + this.var) ;
if (v == null)
- throw new ARQInternalErrorException(Utils.className(this)+ ": Attempt to set variable to null") ;
+ throw new ARQInternalErrorException(Lib.className(this)+ ": Attempt to set variable to null") ;
_setVar(v) ;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/d93f2383/jena-arq/src/main/java/org/apache/jena/sparql/expr/ExprSystem.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/ExprSystem.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/ExprSystem.java
index 6c65906..dc31292 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/ExprSystem.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/ExprSystem.java
@@ -18,10 +18,10 @@
package org.apache.jena.sparql.expr;
+import org.apache.jena.atlas.lib.Lib ;
import org.apache.jena.graph.Node ;
import org.apache.jena.sparql.function.FunctionEnv ;
import org.apache.jena.sparql.util.Symbol ;
-import org.apache.jena.sparql.util.Utils ;
public abstract class ExprSystem extends ExprFunction0
{
@@ -41,7 +41,7 @@ public abstract class ExprSystem extends ExprFunction0
if ( obj == null )
throw new ExprEvalException("null for system symbol: "+systemSymbol) ;
if ( ! ( obj instanceof Node ) )
- throw new ExprEvalException("Not a Node: "+Utils.className(obj)) ;
+ throw new ExprEvalException("Not a Node: "+Lib.className(obj)) ;
Node n = (Node)obj ;
// if ( n == null )
http://git-wip-us.apache.org/repos/asf/jena/blob/d93f2383/jena-arq/src/main/java/org/apache/jena/sparql/function/FunctionBase0.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/function/FunctionBase0.java b/jena-arq/src/main/java/org/apache/jena/sparql/function/FunctionBase0.java
index 323bf1a..6fe9534 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/function/FunctionBase0.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/function/FunctionBase0.java
@@ -20,12 +20,12 @@ package org.apache.jena.sparql.function;
import java.util.List ;
+import org.apache.jena.atlas.lib.Lib ;
import org.apache.jena.query.QueryBuildException ;
import org.apache.jena.sparql.ARQInternalErrorException ;
import org.apache.jena.sparql.expr.ExprEvalException ;
import org.apache.jena.sparql.expr.ExprList ;
import org.apache.jena.sparql.expr.NodeValue ;
-import org.apache.jena.sparql.util.Utils ;
/** Support for a function of zero arguments. */
@@ -35,7 +35,7 @@ public abstract class FunctionBase0 extends FunctionBase
public void checkBuild(String uri, ExprList args)
{
if ( args.size() != 0 )
- throw new QueryBuildException("Function '"+Utils.className(this)+"' takes no arguments") ;
+ throw new QueryBuildException("Function '"+Lib.className(this)+"' takes no arguments") ;
}
@Override
@@ -43,10 +43,10 @@ public abstract class FunctionBase0 extends FunctionBase
{
if ( args == null )
// The contract on the function interface is that this should not happen.
- throw new ARQInternalErrorException("Function '"+Utils.className(this)+" Null args list") ;
+ throw new ARQInternalErrorException("Function '"+Lib.className(this)+" Null args list") ;
if ( args.size() != 0 )
- throw new ExprEvalException("Function '"+Utils.className(this)+" Wanted 0, got "+args.size()) ;
+ throw new ExprEvalException("Function '"+Lib.className(this)+" Wanted 0, got "+args.size()) ;
return exec() ;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/d93f2383/jena-arq/src/main/java/org/apache/jena/sparql/function/FunctionBase1.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/function/FunctionBase1.java b/jena-arq/src/main/java/org/apache/jena/sparql/function/FunctionBase1.java
index 55c5ac2..6abcad3 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/function/FunctionBase1.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/function/FunctionBase1.java
@@ -20,12 +20,12 @@ package org.apache.jena.sparql.function;
import java.util.List ;
+import org.apache.jena.atlas.lib.Lib ;
import org.apache.jena.query.QueryBuildException ;
import org.apache.jena.sparql.ARQInternalErrorException ;
import org.apache.jena.sparql.expr.ExprEvalException ;
import org.apache.jena.sparql.expr.ExprList ;
import org.apache.jena.sparql.expr.NodeValue ;
-import org.apache.jena.sparql.util.Utils ;
/** Support for a function of one argument. */
@@ -35,7 +35,7 @@ public abstract class FunctionBase1 extends FunctionBase
public void checkBuild(String uri, ExprList args)
{
if ( args.size() != 1 )
- throw new QueryBuildException("Function '"+Utils.className(this)+"' takes one argument") ;
+ throw new QueryBuildException("Function '"+Lib.className(this)+"' takes one argument") ;
}
@Override
http://git-wip-us.apache.org/repos/asf/jena/blob/d93f2383/jena-arq/src/main/java/org/apache/jena/sparql/function/FunctionBase2.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/function/FunctionBase2.java b/jena-arq/src/main/java/org/apache/jena/sparql/function/FunctionBase2.java
index e39816c..f64ee61 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/function/FunctionBase2.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/function/FunctionBase2.java
@@ -20,12 +20,12 @@ package org.apache.jena.sparql.function;
import java.util.List ;
+import org.apache.jena.atlas.lib.Lib ;
import org.apache.jena.query.QueryBuildException ;
import org.apache.jena.sparql.ARQInternalErrorException ;
import org.apache.jena.sparql.expr.ExprEvalException ;
import org.apache.jena.sparql.expr.ExprList ;
import org.apache.jena.sparql.expr.NodeValue ;
-import org.apache.jena.sparql.util.Utils ;
/** Support for a function of one argument. */
@@ -35,7 +35,7 @@ public abstract class FunctionBase2 extends FunctionBase
public void checkBuild(String uri, ExprList args)
{
if ( args.size() != 2 )
- throw new QueryBuildException("Function '"+Utils.className(this)+"' takes two arguments") ;
+ throw new QueryBuildException("Function '"+Lib.className(this)+"' takes two arguments") ;
}
@@ -44,10 +44,10 @@ public abstract class FunctionBase2 extends FunctionBase
{
if ( args == null )
// The contract on the function interface is that this should not happen.
- throw new ARQInternalErrorException(Utils.className(this)+": Null args list") ;
+ throw new ARQInternalErrorException(Lib.className(this)+": Null args list") ;
if ( args.size() != 2 )
- throw new ExprEvalException(Utils.className(this)+": Wrong number of arguments: Wanted 2, got "+args.size()) ;
+ throw new ExprEvalException(Lib.className(this)+": Wrong number of arguments: Wanted 2, got "+args.size()) ;
NodeValue v1 = args.get(0) ;
NodeValue v2 = args.get(1) ;
http://git-wip-us.apache.org/repos/asf/jena/blob/d93f2383/jena-arq/src/main/java/org/apache/jena/sparql/function/FunctionBase3.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/function/FunctionBase3.java b/jena-arq/src/main/java/org/apache/jena/sparql/function/FunctionBase3.java
index 253cb6f..882eb85 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/function/FunctionBase3.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/function/FunctionBase3.java
@@ -20,12 +20,12 @@ package org.apache.jena.sparql.function;
import java.util.List ;
+import org.apache.jena.atlas.lib.Lib ;
import org.apache.jena.query.QueryBuildException ;
import org.apache.jena.sparql.ARQInternalErrorException ;
import org.apache.jena.sparql.expr.ExprEvalException ;
import org.apache.jena.sparql.expr.ExprList ;
import org.apache.jena.sparql.expr.NodeValue ;
-import org.apache.jena.sparql.util.Utils ;
/** Support for a function of one argument. */
@@ -35,7 +35,7 @@ public abstract class FunctionBase3 extends FunctionBase
public void checkBuild(String uri, ExprList args)
{
if ( args.size() != 3 )
- throw new QueryBuildException("Function '"+Utils.className(this)+"' takes three arguments") ;
+ throw new QueryBuildException("Function '"+Lib.className(this)+"' takes three arguments") ;
}
@Override
@@ -43,10 +43,10 @@ public abstract class FunctionBase3 extends FunctionBase
{
if ( args == null )
// The contract on the function interface is that this should not happen.
- throw new ARQInternalErrorException(Utils.className(this)+": Null args list") ;
+ throw new ARQInternalErrorException(Lib.className(this)+": Null args list") ;
if ( args.size() != 3 )
- throw new ExprEvalException(Utils.className(this)+": Wrong number of arguments: Wanted 3, got "+args.size()) ;
+ throw new ExprEvalException(Lib.className(this)+": Wrong number of arguments: Wanted 3, got "+args.size()) ;
NodeValue v1 = args.get(0) ;
NodeValue v2 = args.get(1) ;
http://git-wip-us.apache.org/repos/asf/jena/blob/d93f2383/jena-arq/src/main/java/org/apache/jena/sparql/function/FunctionBase4.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/function/FunctionBase4.java b/jena-arq/src/main/java/org/apache/jena/sparql/function/FunctionBase4.java
index 7374a47..6b4f3f9 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/function/FunctionBase4.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/function/FunctionBase4.java
@@ -20,12 +20,12 @@ package org.apache.jena.sparql.function;
import java.util.List ;
+import org.apache.jena.atlas.lib.Lib ;
import org.apache.jena.query.QueryBuildException ;
import org.apache.jena.sparql.ARQInternalErrorException ;
import org.apache.jena.sparql.expr.ExprEvalException ;
import org.apache.jena.sparql.expr.ExprList ;
import org.apache.jena.sparql.expr.NodeValue ;
-import org.apache.jena.sparql.util.Utils ;
/** Support for a function of one argument. */
@@ -35,7 +35,7 @@ public abstract class FunctionBase4 extends FunctionBase
public void checkBuild(String uri, ExprList args)
{
if ( args.size() != 4 )
- throw new QueryBuildException("Function '"+Utils.className(this)+"' takes four arguments") ;
+ throw new QueryBuildException("Function '"+Lib.className(this)+"' takes four arguments") ;
}
@@ -44,10 +44,10 @@ public abstract class FunctionBase4 extends FunctionBase
{
if ( args == null )
// The contract on the function interface is that this should not happen.
- throw new ARQInternalErrorException(Utils.className(this)+": Null args list") ;
+ throw new ARQInternalErrorException(Lib.className(this)+": Null args list") ;
if ( args.size() != 4 )
- throw new ExprEvalException(Utils.className(this)+": Wrong number of arguments: Wanted 4, got "+args.size()) ;
+ throw new ExprEvalException(Lib.className(this)+": Wrong number of arguments: Wanted 4, got "+args.size()) ;
NodeValue v1 = args.get(0) ;
NodeValue v2 = args.get(1) ;
http://git-wip-us.apache.org/repos/asf/jena/blob/d93f2383/jena-arq/src/main/java/org/apache/jena/sparql/function/library/FN_StrConcat.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/function/library/FN_StrConcat.java b/jena-arq/src/main/java/org/apache/jena/sparql/function/library/FN_StrConcat.java
index cae2446..bd5312b 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/function/library/FN_StrConcat.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/function/library/FN_StrConcat.java
@@ -22,12 +22,12 @@ package org.apache.jena.sparql.function.library;
import java.util.List ;
+import org.apache.jena.atlas.lib.Lib ;
import org.apache.jena.sparql.ARQInternalErrorException ;
import org.apache.jena.sparql.expr.ExprList ;
import org.apache.jena.sparql.expr.NodeValue ;
import org.apache.jena.sparql.expr.nodevalue.XSDFuncOp ;
import org.apache.jena.sparql.function.FunctionBase ;
-import org.apache.jena.sparql.util.Utils ;
/** Function that concatenates arguments as strings.
* fn:concat */
@@ -40,7 +40,7 @@ public class FN_StrConcat extends FunctionBase
{
if ( args == null )
// The contract on the function interface is that this should not happen.
- throw new ARQInternalErrorException(Utils.className(this)+": Null args list") ;
+ throw new ARQInternalErrorException(Lib.className(this)+": Null args list") ;
return XSDFuncOp.fnConcat(args) ;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/d93f2383/jena-arq/src/main/java/org/apache/jena/sparql/function/library/FN_StrSubstring.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/function/library/FN_StrSubstring.java b/jena-arq/src/main/java/org/apache/jena/sparql/function/library/FN_StrSubstring.java
index f29f4ca..e7bf963 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/function/library/FN_StrSubstring.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/function/library/FN_StrSubstring.java
@@ -20,13 +20,13 @@ package org.apache.jena.sparql.function.library;
import java.util.List ;
+import org.apache.jena.atlas.lib.Lib ;
import org.apache.jena.query.QueryBuildException ;
import org.apache.jena.sparql.expr.ExprEvalException ;
import org.apache.jena.sparql.expr.ExprList ;
import org.apache.jena.sparql.expr.NodeValue ;
import org.apache.jena.sparql.expr.nodevalue.XSDFuncOp ;
import org.apache.jena.sparql.function.FunctionBase ;
-import org.apache.jena.sparql.util.Utils ;
/** substring(string, start[, length]) - F&O style*/
@@ -38,7 +38,7 @@ public class FN_StrSubstring extends FunctionBase
public void checkBuild(String uri, ExprList args)
{
if ( args.size() != 2 && args.size() != 3 )
- throw new QueryBuildException("Function '"+Utils.className(this)+"' takes two or three arguments") ;
+ throw new QueryBuildException("Function '"+Lib.className(this)+"' takes two or three arguments") ;
}
@Override
public NodeValue exec(List<NodeValue> args)
http://git-wip-us.apache.org/repos/asf/jena/blob/d93f2383/jena-arq/src/main/java/org/apache/jena/sparql/function/library/SystemVar.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/function/library/SystemVar.java b/jena-arq/src/main/java/org/apache/jena/sparql/function/library/SystemVar.java
index ff65c0d..7baf105 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/function/library/SystemVar.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/function/library/SystemVar.java
@@ -20,13 +20,13 @@ package org.apache.jena.sparql.function.library;
//import org.apache.commons.logging.*;
+import org.apache.jena.atlas.lib.Lib ;
import org.apache.jena.graph.Node ;
import org.apache.jena.sparql.expr.ExprEvalException ;
import org.apache.jena.sparql.expr.ExprException ;
import org.apache.jena.sparql.expr.NodeValue ;
import org.apache.jena.sparql.function.FunctionBase0 ;
import org.apache.jena.sparql.util.Symbol ;
-import org.apache.jena.sparql.util.Utils ;
/** Function that returns the value of a system variable. */
@@ -49,7 +49,7 @@ public class SystemVar extends FunctionBase0
if ( obj == null )
throw new ExprEvalException("null for system symbol: "+systemSymbol) ;
if ( ! ( obj instanceof Node ) )
- throw new ExprEvalException("Not a Node: "+Utils.className(obj)) ;
+ throw new ExprEvalException("Not a Node: "+Lib.className(obj)) ;
Node n = (Node)obj ;
// if ( n == null )