http://git-wip-us.apache.org/repos/asf/jena/blob/d93f2383/jena-arq/src/main/java/org/apache/jena/sparql/function/library/leviathan/cartesian.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/function/library/leviathan/cartesian.java b/jena-arq/src/main/java/org/apache/jena/sparql/function/library/leviathan/cartesian.java index 943db45..bf9fd05 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/function/library/leviathan/cartesian.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/function/library/leviathan/cartesian.java @@ -20,12 +20,12 @@ package org.apache.jena.sparql.function.library.leviathan; 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.function.FunctionBase ; -import org.apache.jena.sparql.util.Utils ; public class cartesian extends FunctionBase { @@ -56,7 +56,7 @@ public class cartesian extends FunctionBase { @Override public void checkBuild(String uri, ExprList args) { if (args.size() != 4 && args.size() != 6) - throw new QueryBuildException("Function '" + Utils.className(this) + "' takes 4 or 6 argument(s)"); + throw new QueryBuildException("Function '" + Lib.className(this) + "' takes 4 or 6 argument(s)"); } }
http://git-wip-us.apache.org/repos/asf/jena/blob/d93f2383/jena-arq/src/main/java/org/apache/jena/sparql/function/library/leviathan/log.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/function/library/leviathan/log.java b/jena-arq/src/main/java/org/apache/jena/sparql/function/library/leviathan/log.java index bc5122b..3d6f27a 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/function/library/leviathan/log.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/function/library/leviathan/log.java @@ -20,12 +20,12 @@ package org.apache.jena.sparql.function.library.leviathan; 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.function.FunctionBase ; -import org.apache.jena.sparql.util.Utils ; public class log extends FunctionBase { @@ -51,7 +51,7 @@ public class log extends FunctionBase { @Override public void checkBuild(String uri, ExprList args) { if (args.size() < 1 || args.size() > 2) - throw new QueryBuildException("Function '" + Utils.className(this) + "' takes one/two argument(s)"); + throw new QueryBuildException("Function '" + Lib.className(this) + "' takes one/two argument(s)"); } } http://git-wip-us.apache.org/repos/asf/jena/blob/d93f2383/jena-arq/src/main/java/org/apache/jena/sparql/function/library/leviathan/rnd.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/function/library/leviathan/rnd.java b/jena-arq/src/main/java/org/apache/jena/sparql/function/library/leviathan/rnd.java index fd65aaa..2b24a5a 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/function/library/leviathan/rnd.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/function/library/leviathan/rnd.java @@ -20,13 +20,13 @@ package org.apache.jena.sparql.function.library.leviathan; import java.util.List; +import org.apache.jena.atlas.lib.Lib ; import org.apache.jena.atlas.lib.RandomLib; 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.function.FunctionBase ; -import org.apache.jena.sparql.util.Utils ; public class rnd extends FunctionBase { @@ -62,7 +62,7 @@ public class rnd extends FunctionBase { @Override public void checkBuild(String uri, ExprList args) { if (args.size() > 2) - throw new QueryBuildException("Function '" + Utils.className(this) + throw new QueryBuildException("Function '" + Lib.className(this) + "' takes between 0, 1 or 2 argument(s)"); } http://git-wip-us.apache.org/repos/asf/jena/blob/d93f2383/jena-arq/src/main/java/org/apache/jena/sparql/function/library/strjoin.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/function/library/strjoin.java b/jena-arq/src/main/java/org/apache/jena/sparql/function/library/strjoin.java index 9197fbb..7a019b9 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/function/library/strjoin.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/function/library/strjoin.java @@ -24,13 +24,13 @@ import java.util.ArrayList ; import java.util.Iterator ; import java.util.List ; +import org.apache.jena.atlas.lib.Lib ; import org.apache.jena.atlas.lib.StrUtils ; import org.apache.jena.query.QueryBuildException ; 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.function.FunctionBase ; -import org.apache.jena.sparql.util.Utils ; /** Function that concatenates strings using a separator. * This is not fn:string-join because @@ -45,7 +45,7 @@ public class strjoin 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") ; Iterator<NodeValue> iter = args.iterator() ; String sep = iter.next().asString() ; @@ -64,6 +64,6 @@ public class strjoin extends FunctionBase public void checkBuild(String uri, ExprList args) { if ( args.size() < 1 ) - throw new QueryBuildException("Function '"+Utils.className(this)+"' requires at least one arguments") ; + throw new QueryBuildException("Function '"+Lib.className(this)+"' requires at least one arguments") ; } } http://git-wip-us.apache.org/repos/asf/jena/blob/d93f2383/jena-arq/src/main/java/org/apache/jena/sparql/function/library/substring.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/function/library/substring.java b/jena-arq/src/main/java/org/apache/jena/sparql/function/library/substring.java index 596cb2c..b16a8fb 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/function/library/substring.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/function/library/substring.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[, finish]) - Java style */ @@ -38,7 +38,7 @@ public class substring 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/pfunction/PropertyFunctionFactoryAuto.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/pfunction/PropertyFunctionFactoryAuto.java b/jena-arq/src/main/java/org/apache/jena/sparql/pfunction/PropertyFunctionFactoryAuto.java index d76bc4c..8fe9b34 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/pfunction/PropertyFunctionFactoryAuto.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/pfunction/PropertyFunctionFactoryAuto.java @@ -18,9 +18,9 @@ package org.apache.jena.sparql.pfunction; +import org.apache.jena.atlas.lib.Lib ; import org.apache.jena.query.QueryBuildException ; import org.apache.jena.sparql.ARQInternalErrorException ; -import org.apache.jena.sparql.util.Utils ; /** PropertyFunction factory that instantiates a class each time. */ @@ -33,7 +33,7 @@ class PropertyFunctionFactoryAuto implements PropertyFunctionFactory extClass = xClass ; if ( ! PropertyFunction.class.isAssignableFrom(xClass) ) - throw new ARQInternalErrorException("No PropertyFunction interface for "+Utils.classShortName(xClass)) ; + throw new ARQInternalErrorException("No PropertyFunction interface for "+Lib.classShortName(xClass)) ; } @Override http://git-wip-us.apache.org/repos/asf/jena/blob/d93f2383/jena-arq/src/main/java/org/apache/jena/sparql/pfunction/library/splitIRI.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/pfunction/library/splitIRI.java b/jena-arq/src/main/java/org/apache/jena/sparql/pfunction/library/splitIRI.java index 55bd319..ead385a 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/pfunction/library/splitIRI.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/pfunction/library/splitIRI.java @@ -18,6 +18,7 @@ package org.apache.jena.sparql.pfunction.library; +import org.apache.jena.atlas.lib.Lib ; import org.apache.jena.atlas.logging.Log ; import org.apache.jena.graph.Node ; import org.apache.jena.graph.NodeFactory ; @@ -34,7 +35,6 @@ import org.apache.jena.sparql.pfunction.PropFuncArgType ; import org.apache.jena.sparql.pfunction.PropertyFunctionEval ; import org.apache.jena.sparql.util.IterLib ; import org.apache.jena.sparql.util.NodeUtils ; -import org.apache.jena.sparql.util.Utils ; public class splitIRI extends PropertyFunctionEval //PropertyFunctionBase { @@ -49,11 +49,11 @@ public class splitIRI extends PropertyFunctionEval //PropertyFunctionBase // Do some checking. // These checks are assumed to be passed in .exec() if ( argSubject.isList() ) - throw new QueryBuildException(Utils.className(this)+ "Subject must be a single node or variable, not a list") ; + throw new QueryBuildException(Lib.className(this)+ "Subject must be a single node or variable, not a list") ; if ( ! argObject.isList() ) - throw new QueryBuildException(Utils.className(this)+ "Object must be a list of two elements") ; + throw new QueryBuildException(Lib.className(this)+ "Object must be a list of two elements") ; if ( argObject.getArgList().size() != 2 ) - throw new QueryBuildException(Utils.className(this)+ "Object is a list but it has "+argObject.getArgList().size()+" elements - should be 2") ; + throw new QueryBuildException(Lib.className(this)+ "Object is a list but it has "+argObject.getArgList().size()+" elements - should be 2") ; } // Implementing .exec requires considering all the cases of variable being http://git-wip-us.apache.org/repos/asf/jena/blob/d93f2383/jena-arq/src/main/java/org/apache/jena/sparql/resultset/ResultSetMem.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/resultset/ResultSetMem.java b/jena-arq/src/main/java/org/apache/jena/sparql/resultset/ResultSetMem.java index cf5f7e6..040ed36 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/resultset/ResultSetMem.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/resultset/ResultSetMem.java @@ -22,12 +22,12 @@ import java.util.ArrayList ; import java.util.List ; import org.apache.jena.atlas.iterator.PeekIterator ; +import org.apache.jena.atlas.lib.Lib ; import org.apache.jena.query.QuerySolution ; import org.apache.jena.query.ResultSet ; import org.apache.jena.rdf.model.Model ; import org.apache.jena.sparql.core.ResultBinding ; import org.apache.jena.sparql.engine.binding.Binding ; -import org.apache.jena.sparql.util.Utils ; /** An in-memory result set. * Also useful for writing input processors which @@ -140,7 +140,7 @@ public class ResultSetMem implements org.apache.jena.query.ResultSetRewindable, public void remove() throws java.lang.UnsupportedOperationException { throw new java.lang.UnsupportedOperationException( - Utils.className(this)+": Attempt to remove an element"); + Lib.className(this)+": Attempt to remove an element"); } /** http://git-wip-us.apache.org/repos/asf/jena/blob/d93f2383/jena-arq/src/main/java/org/apache/jena/sparql/util/Loader.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/util/Loader.java b/jena-arq/src/main/java/org/apache/jena/sparql/util/Loader.java index 53b5153..1143c38 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/util/Loader.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/util/Loader.java @@ -18,6 +18,7 @@ package org.apache.jena.sparql.util; +import org.apache.jena.atlas.lib.Lib ; import org.apache.jena.atlas.logging.Log; import org.apache.jena.sparql.ARQConstants ; import org.apache.jena.sparql.ARQInternalErrorException ; @@ -91,7 +92,7 @@ public class Loader { } if (requiredClass != null && !requiredClass.isAssignableFrom(classObj)) { - Log.warn(Loader.class, "Class '" + className + "' found but not a " + Utils.classShortName(requiredClass)); + Log.warn(Loader.class, "Class '" + className + "' found but not a " + Lib.classShortName(requiredClass)); return null; } return classObj; http://git-wip-us.apache.org/repos/asf/jena/blob/d93f2383/jena-arq/src/main/java/org/apache/jena/sparql/util/PrintSerializableBase.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/util/PrintSerializableBase.java b/jena-arq/src/main/java/org/apache/jena/sparql/util/PrintSerializableBase.java index 5f76714..9c40720 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/util/PrintSerializableBase.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/util/PrintSerializableBase.java @@ -20,6 +20,7 @@ package org.apache.jena.sparql.util; import org.apache.jena.atlas.io.IndentedWriter ; import org.apache.jena.atlas.io.PrintUtils ; +import org.apache.jena.atlas.lib.Lib ; import org.apache.jena.shared.PrefixMapping ; import org.apache.jena.sparql.engine.Plan ; @@ -39,7 +40,7 @@ public abstract class PrintSerializableBase implements PrintSerializable public void output(IndentedWriter out) { out.print(Plan.startMarker) ; - out.print(Utils.className(this)) ; + out.print(Lib.className(this)) ; out.print(Plan.finishMarker) ; } } http://git-wip-us.apache.org/repos/asf/jena/blob/d93f2383/jena-arq/src/main/java/org/apache/jena/sparql/util/QueryOutputUtils.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/util/QueryOutputUtils.java b/jena-arq/src/main/java/org/apache/jena/sparql/util/QueryOutputUtils.java index 2279536..d109be5 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/util/QueryOutputUtils.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/util/QueryOutputUtils.java @@ -20,6 +20,7 @@ package org.apache.jena.sparql.util; import org.apache.jena.atlas.io.IndentedLineBuffer ; import org.apache.jena.atlas.io.IndentedWriter ; +import org.apache.jena.atlas.lib.Lib ; import org.apache.jena.query.ARQ ; import org.apache.jena.query.Query ; import org.apache.jena.query.QueryExecution ; @@ -54,7 +55,7 @@ public class QueryOutputUtils { QueryEngineFactory f = QueryEngineRegistry.findFactory(query, qe.getDataset().asDatasetGraph(), ARQ.getContext()) ; if ( f == null ) - System.err.println("printPlan: Unknown engine type: "+Utils.className(qe)) ; + System.err.println("printPlan: Unknown engine type: "+Lib.className(qe)) ; Plan plan = f.create(query, qe.getDataset().asDatasetGraph(), BindingRoot.create(), ARQ.getContext()) ; SerializationContext sCxt = new SerializationContext(query) ; http://git-wip-us.apache.org/repos/asf/jena/blob/d93f2383/jena-arq/src/main/java/org/apache/jena/sparql/util/Utils.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/util/Utils.java b/jena-arq/src/main/java/org/apache/jena/sparql/util/Utils.java index 51edb3a..dbcbc24 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/util/Utils.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/util/Utils.java @@ -24,6 +24,7 @@ import java.util.Date ; import java.util.GregorianCalendar ; import org.apache.commons.lang3.time.FastDateFormat ; +import org.apache.jena.atlas.lib.Lib ; import org.apache.jena.datatypes.xsd.XSDDateTime ; /** Miscellaneous operations - not query specific */ @@ -55,17 +56,20 @@ public class Utils { // For milliseconds != 0 private static final FastDateFormat timeFmt_XSD_ms = FastDateFormat.getInstance("HH:mm:ss.SSSZZ") ; + /** + * @deprecated Use {@link Lib#className(Object)} instead + */ + @Deprecated static public String className(Object obj) { - if ( obj == null ) - return "null" ; - return classShortName(obj.getClass()) ; + return Lib.className(obj) ; } + /** + * @deprecated Use {@link Lib#classShortName(Class)} instead + */ + @Deprecated static public String classShortName(Class<? > cls) { - String tmp = cls.getName() ; - int i = tmp.lastIndexOf('.') ; - tmp = tmp.substring(i + 1) ; - return tmp ; + return Lib.classShortName(cls) ; } public static String nowAsXSDDateTimeString() { http://git-wip-us.apache.org/repos/asf/jena/blob/d93f2383/jena-arq/src/main/java/org/apache/jena/sparql/util/Version.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/util/Version.java b/jena-arq/src/main/java/org/apache/jena/sparql/util/Version.java index dd3d2be..ef341ed 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/util/Version.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/util/Version.java @@ -25,6 +25,7 @@ import java.util.List ; import org.apache.jena.atlas.io.IndentedLineBuffer ; import org.apache.jena.atlas.io.IndentedWriter ; +import org.apache.jena.atlas.lib.Lib ; /** Manage version information for subsystems */ public class Version @@ -62,7 +63,7 @@ public class Version { for ( Class<?> c : classes ) { - String x = Utils.classShortName( c ); + String x = Lib.classShortName( c ); fields( writer, x, c ); } } @@ -78,7 +79,7 @@ public class Version while (iter.hasNext()) { Class<?> c = iter.next(); - String component = Utils.classShortName(c) ; + String component = Lib.classShortName(c) ; String version = field(FIELD_VERSION, c); String timestamp = field(FIELD_BUILD_DATE, c); buffer.append("%s Version %s (Built %s)", component, version, timestamp); http://git-wip-us.apache.org/repos/asf/jena/blob/d93f2383/jena-arq/src/main/java/riotcmd/dumpthrift.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/riotcmd/dumpthrift.java b/jena-arq/src/main/java/riotcmd/dumpthrift.java index 958b125..2e827bb 100644 --- a/jena-arq/src/main/java/riotcmd/dumpthrift.java +++ b/jena-arq/src/main/java/riotcmd/dumpthrift.java @@ -21,10 +21,10 @@ package riotcmd; import java.io.InputStream ; import org.apache.jena.atlas.io.IO ; +import org.apache.jena.atlas.lib.Lib ; import org.apache.jena.atlas.logging.LogCtl ; import org.apache.jena.riot.RIOT ; import org.apache.jena.riot.thrift.BinRDF ; -import org.apache.jena.sparql.util.Utils ; /** Dump an rdf-thrift file to show structure */ public class dumpthrift { @@ -37,7 +37,7 @@ public class dumpthrift { } if ( args.length != 1 ) { - System.err.println("Usage: "+Utils.classShortName(dumpthrift.class)+" FILE") ; + System.err.println("Usage: "+Lib.classShortName(dumpthrift.class)+" FILE") ; System.exit(2) ; } http://git-wip-us.apache.org/repos/asf/jena/blob/d93f2383/jena-arq/src/main/java/riotcmd/nquads.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/riotcmd/nquads.java b/jena-arq/src/main/java/riotcmd/nquads.java index ae35b81..d76cf96 100644 --- a/jena-arq/src/main/java/riotcmd/nquads.java +++ b/jena-arq/src/main/java/riotcmd/nquads.java @@ -18,10 +18,10 @@ package riotcmd; +import org.apache.jena.atlas.lib.Lib ; import org.apache.jena.atlas.web.ContentType ; import org.apache.jena.riot.Lang ; import org.apache.jena.riot.RDFLanguages ; -import org.apache.jena.sparql.util.Utils ; /** Run the N-Quads parser - and produce N-Quads */ public class nquads extends CmdLangParse @@ -39,7 +39,7 @@ public class nquads extends CmdLangParse @Override protected String getCommandName() { - return Utils.classShortName(nquads.class) ; + return Lib.classShortName(nquads.class) ; } @Override http://git-wip-us.apache.org/repos/asf/jena/blob/d93f2383/jena-arq/src/main/java/riotcmd/ntriples.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/riotcmd/ntriples.java b/jena-arq/src/main/java/riotcmd/ntriples.java index 1f8c195..dd20e82 100644 --- a/jena-arq/src/main/java/riotcmd/ntriples.java +++ b/jena-arq/src/main/java/riotcmd/ntriples.java @@ -18,10 +18,10 @@ package riotcmd; +import org.apache.jena.atlas.lib.Lib ; import org.apache.jena.atlas.web.ContentType ; import org.apache.jena.riot.Lang ; import org.apache.jena.riot.RDFLanguages ; -import org.apache.jena.sparql.util.Utils ; /** Run the N-triples parser - and produce N-triples */ public class ntriples extends CmdLangParse @@ -39,7 +39,7 @@ public class ntriples extends CmdLangParse @Override protected String getCommandName() { - return Utils.classShortName(ntriples.class) ; + return Lib.classShortName(ntriples.class) ; } @Override http://git-wip-us.apache.org/repos/asf/jena/blob/d93f2383/jena-arq/src/main/java/riotcmd/rdfxml.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/riotcmd/rdfxml.java b/jena-arq/src/main/java/riotcmd/rdfxml.java index 2955f4b..d4346da 100644 --- a/jena-arq/src/main/java/riotcmd/rdfxml.java +++ b/jena-arq/src/main/java/riotcmd/rdfxml.java @@ -18,10 +18,10 @@ package riotcmd; +import org.apache.jena.atlas.lib.Lib ; import org.apache.jena.atlas.web.ContentType ; import org.apache.jena.riot.Lang ; import org.apache.jena.riot.RDFLanguages ; -import org.apache.jena.sparql.util.Utils ; /** Run the RDf/XML parser - and produce triples */ public class rdfxml extends CmdLangParse @@ -39,7 +39,7 @@ public class rdfxml extends CmdLangParse @Override protected String getCommandName() { - return Utils.classShortName(rdfxml.class) ; + return Lib.classShortName(rdfxml.class) ; } @Override http://git-wip-us.apache.org/repos/asf/jena/blob/d93f2383/jena-arq/src/main/java/riotcmd/riot.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/riotcmd/riot.java b/jena-arq/src/main/java/riotcmd/riot.java index df8e5f0..1bf8cf6 100644 --- a/jena-arq/src/main/java/riotcmd/riot.java +++ b/jena-arq/src/main/java/riotcmd/riot.java @@ -18,11 +18,11 @@ package riotcmd; +import org.apache.jena.atlas.lib.Lib ; import org.apache.jena.atlas.web.ContentType ; import org.apache.jena.riot.Lang ; import org.apache.jena.riot.RDFLanguages ; import org.apache.jena.riot.WebContent ; -import org.apache.jena.sparql.util.Utils ; /** * Guess the syntax from the filename. @@ -57,6 +57,6 @@ public class riot extends CmdLangParse @Override protected String getCommandName() { - return Utils.classShortName(riot.class) ; + return Lib.classShortName(riot.class) ; } } http://git-wip-us.apache.org/repos/asf/jena/blob/d93f2383/jena-arq/src/main/java/riotcmd/trig.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/riotcmd/trig.java b/jena-arq/src/main/java/riotcmd/trig.java index 0798a10..08a24df 100644 --- a/jena-arq/src/main/java/riotcmd/trig.java +++ b/jena-arq/src/main/java/riotcmd/trig.java @@ -18,10 +18,10 @@ package riotcmd; +import org.apache.jena.atlas.lib.Lib ; import org.apache.jena.atlas.web.ContentType ; import org.apache.jena.riot.Lang ; import org.apache.jena.riot.RDFLanguages ; -import org.apache.jena.sparql.util.Utils ; /** Run the TriG parser - and produce N-Quads */ public class trig extends CmdLangParse @@ -39,7 +39,7 @@ public class trig extends CmdLangParse @Override protected String getCommandName() { - return Utils.classShortName(trig.class) ; + return Lib.classShortName(trig.class) ; } @Override http://git-wip-us.apache.org/repos/asf/jena/blob/d93f2383/jena-arq/src/main/java/riotcmd/turtle.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/riotcmd/turtle.java b/jena-arq/src/main/java/riotcmd/turtle.java index 8295b93..776803b 100644 --- a/jena-arq/src/main/java/riotcmd/turtle.java +++ b/jena-arq/src/main/java/riotcmd/turtle.java @@ -18,10 +18,10 @@ package riotcmd; +import org.apache.jena.atlas.lib.Lib ; import org.apache.jena.atlas.web.ContentType ; import org.apache.jena.riot.Lang ; import org.apache.jena.riot.RDFLanguages ; -import org.apache.jena.sparql.util.Utils ; /** Run the Turtle parser - and produce N-triples */ public class turtle extends CmdLangParse @@ -39,7 +39,7 @@ public class turtle extends CmdLangParse @Override protected String getCommandName() { - return Utils.classShortName(turtle.class) ; + return Lib.classShortName(turtle.class) ; } @Override http://git-wip-us.apache.org/repos/asf/jena/blob/d93f2383/jena-arq/src/test/java/arq/qtest.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/test/java/arq/qtest.java b/jena-arq/src/test/java/arq/qtest.java index c60d98a..8f1ae72 100644 --- a/jena-arq/src/test/java/arq/qtest.java +++ b/jena-arq/src/test/java/arq/qtest.java @@ -21,6 +21,7 @@ package arq; import java.io.File ; import junit.framework.TestSuite ; +import org.apache.jena.atlas.lib.Lib ; import org.apache.jena.graph.Node ; import org.apache.jena.query.ARQ ; import org.apache.jena.rdf.model.Literal ; @@ -33,7 +34,6 @@ import org.apache.jena.sparql.junit.EarlReport ; import org.apache.jena.sparql.junit.ScriptTestSuiteFactory ; import org.apache.jena.sparql.junit.SimpleTestRunner ; import org.apache.jena.sparql.util.NodeFactoryExtra ; -import org.apache.jena.sparql.util.Utils ; import org.apache.jena.sparql.vocabulary.DOAP ; import org.apache.jena.sparql.vocabulary.FOAF ; import org.apache.jena.sparql.vocabulary.TestManifest ; @@ -112,7 +112,7 @@ public class qtest 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> --result=<results> ] | --all | --dawg | <manifest>" ; } http://git-wip-us.apache.org/repos/asf/jena/blob/d93f2383/jena-arq/src/test/java/riotcmd/rdflangtest.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/test/java/riotcmd/rdflangtest.java b/jena-arq/src/test/java/riotcmd/rdflangtest.java index f008fea..214284b 100644 --- a/jena-arq/src/test/java/riotcmd/rdflangtest.java +++ b/jena-arq/src/test/java/riotcmd/rdflangtest.java @@ -20,6 +20,7 @@ package riotcmd; import junit.framework.TestSuite ; import org.apache.jena.atlas.junit.BaseTest ; +import org.apache.jena.atlas.lib.Lib ; import org.apache.jena.graph.Node ; import org.apache.jena.query.ARQ ; import org.apache.jena.rdf.model.Literal ; @@ -35,7 +36,6 @@ import org.apache.jena.sparql.expr.NodeValue ; import org.apache.jena.sparql.junit.EarlReport ; import org.apache.jena.sparql.junit.SimpleTestRunner ; import org.apache.jena.sparql.util.NodeFactoryExtra ; -import org.apache.jena.sparql.util.Utils ; import org.apache.jena.sparql.vocabulary.DOAP ; import org.apache.jena.sparql.vocabulary.FOAF ; import org.apache.jena.vocabulary.DC ; @@ -94,7 +94,7 @@ public class rdflangtest extends CmdGeneral } @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> --result=<results> ] | --all | --dawg | <manifest>" ; } http://git-wip-us.apache.org/repos/asf/jena/blob/d93f2383/jena-csv/src/main/java/org/apache/jena/propertytable/graph/QueryIterPropertyTable.java ---------------------------------------------------------------------- diff --git a/jena-csv/src/main/java/org/apache/jena/propertytable/graph/QueryIterPropertyTable.java b/jena-csv/src/main/java/org/apache/jena/propertytable/graph/QueryIterPropertyTable.java index 17a481d..8ebfa72 100644 --- a/jena-csv/src/main/java/org/apache/jena/propertytable/graph/QueryIterPropertyTable.java +++ b/jena-csv/src/main/java/org/apache/jena/propertytable/graph/QueryIterPropertyTable.java @@ -18,12 +18,13 @@ package org.apache.jena.propertytable.graph; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.List; +import java.util.ArrayList ; +import java.util.Collection ; +import java.util.HashMap ; +import java.util.List ; -import org.apache.jena.atlas.io.IndentedWriter; +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.graph.Triple ; @@ -34,7 +35,6 @@ import org.apache.jena.sparql.engine.binding.Binding ; import org.apache.jena.sparql.engine.iterator.QueryIter1 ; import org.apache.jena.sparql.serializer.SerializationContext ; import org.apache.jena.sparql.util.FmtUtils ; -import org.apache.jena.sparql.util.Utils ; /** * Split the incoming BasicPattern by subjects, (i.e. it becomes multiple sub BasicPatterns grouped by the same subjects. @@ -105,7 +105,7 @@ public class QueryIterPropertyTable 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-csv/src/main/java/org/apache/jena/propertytable/lang/LangCSV.java ---------------------------------------------------------------------- diff --git a/jena-csv/src/main/java/org/apache/jena/propertytable/lang/LangCSV.java b/jena-csv/src/main/java/org/apache/jena/propertytable/lang/LangCSV.java index 8fbb815..16fde2e 100644 --- a/jena-csv/src/main/java/org/apache/jena/propertytable/lang/LangCSV.java +++ b/jena-csv/src/main/java/org/apache/jena/propertytable/lang/LangCSV.java @@ -24,10 +24,10 @@ import java.util.ArrayList ; import java.util.List ; import org.apache.jena.atlas.csv.CSVParser ; +import org.apache.jena.atlas.lib.IRILib ; import org.apache.jena.datatypes.xsd.XSDDatatype ; import org.apache.jena.graph.Node ; import org.apache.jena.graph.NodeFactory ; -import org.apache.jena.propertytable.util.IRILib ; import org.apache.jena.riot.Lang ; import org.apache.jena.riot.RDFLanguages ; import org.apache.jena.riot.lang.LangRIOT ; http://git-wip-us.apache.org/repos/asf/jena/blob/d93f2383/jena-csv/src/main/java/org/apache/jena/propertytable/util/IRILib.java ---------------------------------------------------------------------- diff --git a/jena-csv/src/main/java/org/apache/jena/propertytable/util/IRILib.java b/jena-csv/src/main/java/org/apache/jena/propertytable/util/IRILib.java deleted file mode 100644 index b535c88..0000000 --- a/jena-csv/src/main/java/org/apache/jena/propertytable/util/IRILib.java +++ /dev/null @@ -1,264 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.jena.propertytable.util; - -import java.io.File ; -import java.io.IOException ; - -import org.apache.jena.atlas.AtlasException ; -import org.apache.jena.atlas.lib.Chars ; -import org.apache.jena.atlas.lib.StrUtils ; -import org.apache.jena.riot.SysRIOT ; - -/** - * Operations related to IRIs. - * Add support for '£', based on {@link org.apache.jena.riot.system.IRILib} - * - * This class should be merged into riot IRILib in future. - */ -public class IRILib -{ - // http://www.w3.org/TR/xpath-functions/#func-encode-for-uri - // Encodes delimiters. - - /* RFC 3986 - * - * unreserved = ALPHA / DIGIT / "-" / "." / "_" / "~" - * gen-delims = ":" / "/" / "?" / "#" / "[" / "]" / "@" - * sub-delims = "!" / "$" / "&" / "'" / "(" / ")" - / "*" / "+" / "," / ";" / "=" - */ - - private static char uri_reserved[] = - { - '!', '*', '"', '\'', '(', ')', ';', ':', '@', '&', - '=', '+', '$', ',', '/', '?', '%', '#', '[', ']'} ; - - // No allowed in URIs - private static char uri_non_chars[] = { '<', '>', '{', '}', '|', '\\', '`', '^', ' ', '\n', '\r', '\t', '£' } ; - - // RFC 2396 - //private static char uri_unwise[] = { '{' , '}', '|', '\\', '^', '[', ']', '`' } ; - - - private static char[] charsComponent = - // reserved, + non-chars + nasties. - { '!', '*', '"', '\'', '(', ')', ';', ':', '@', '&', - '=', '+', '$', ',', '/', '?', '%', '#', '[', ']', - '{', '}', '|', '\\', '`', '^', - ' ', '<', '>', '\n', '\r', '\t', '£' } ; - - private static char[] charsFilename = - // reserved, + non-chars + nasties. - // Leave : (Windows drive charcater) and / (separator) alone - // include SPC and ~ - { '!', '*', '"', '\'', '(', ')', ';', /*':',*/ '@', '&', - '=', '+', '$', ',', /*'/',*/ '?', '%', '#', '[', ']', - '{', '}', '|', '\\', '`', '^', - ' ', '<', '>', '\n', '\r', '\t', - '~'} ; - - private static char[] charsPath = - { - // Reserved except leave the separators alone. - // Leave the path separator alone. - // Leave the drive separator alone. - '!', '*', '"', '\'', '(', ')', ';', /*':',*/ '@', '&', - '=', '+', '$', ',', /*'/',*/ '?', '%', '#', '[', ']', - '{', '}', '|', '\\', '`', '^', - // Other junk - ' ', '<', '>', '\n', '\r', '\t' } ; - - // The initializers must have run. - static final String cwd ; - static final String cwdURL ; - - // Current directory, with trailing "/" - // This matters for resolution. - static { - String x = new File(".").getAbsolutePath() ; - x = x.substring(0, x.length()-1) ; - cwd = x ; - cwdURL = plainFilenameToURL(cwd) ; - } - - // See also IRIResolver - /** Return a string that is an IRI for the filename.*/ - public static String fileToIRI(File f) - { - return filenameToIRI(f.getAbsolutePath()) ; - } - - /** Create a string that is a IRI for the filename. - * The file name may already have file:. - * The file name may be relative. - * Encode using the rules for a path (e.g. ':' and'/' do not get encoded) - */ - public static String filenameToIRI(String fn) - { - if ( fn == null ) return cwdURL ; - - if ( fn.length() == 0 ) return cwdURL ; - - if ( fn.startsWith("file:") ) - return normalizeFilenameURI(fn) ; - return plainFilenameToURL(fn) ; - } - - /** Convert an IRI to a filename */ - public static String IRIToFilename(String iri) - { - if ( ! iri.startsWith("file:") ) - throw new AtlasException("Not a file: URI: "+iri) ; - - String fn ; - if ( iri.startsWith("file:///") ) - fn = iri.substring("file://".length()) ; - else - fn = iri.substring("file:".length()) ; - return decode(fn) ; - } - - /** Convert a plain file name (no file:) to a file: URL */ - private static String plainFilenameToURL(String fn) - { - // No "file:" - // Make Absolute filename. - boolean trailingSlash = fn.endsWith("/") ; - File file = new File(fn) ; - - try { fn = file.getCanonicalPath() ; } - catch (IOException e) { fn = file.getAbsolutePath() ; } - - if ( trailingSlash && ! fn.endsWith("/") ) - fn = fn + "/" ; - - if ( SysRIOT.isWindows ) - { - // C:\ => file:///C:/... - if ( fn.length() >= 2 && fn.charAt(1) == ':' ) - // Windows drive letter - already absolute path. - // Make "URI" absolute path - fn = "/"+fn ; - // Convert \ to / - // Maybe should do this on all platforms? i.e consistency. - fn = fn.replace('\\', '/' ) ; - } - - fn = encodeFileURL(fn) ; - return "file://"+fn ; - } - - - /** Sanitize a "file:" URL. Must start "file:" */ - private static String normalizeFilenameURI(String fn) - { - if ( ! fn.startsWith("file:/") ) - { - // Relative path. - String fn2 = fn.substring("file:".length()) ; - return plainFilenameToURL(fn2) ; - } - - // Starts file:/// - if ( fn.startsWith("file:///") ) - // Assume it's good as return as-is. - return fn ; - - if ( fn.startsWith("file://") ) - { - String fn2 = fn.substring("file:/".length()) ; // Leave one "/" - return plainFilenameToURL(fn2) ; - } - - // Must be file:/ - String fn2 = fn.substring("file:".length()) ; - return plainFilenameToURL(fn2) ; - } - - /** Encode using the rules for a component (e.g. ':' and '/' get encoded) - * Does not encode non-ASCII characters - */ - public static String encodeUriComponent(String string) - { - String encStr = StrUtils.encodeHex(string,'%', charsComponent) ; - return encStr ; - } - - /** Encode using the rules for a file: URL. - * Does not encode non-ASCII characters - */ - public static String encodeFileURL(String string) - { - String encStr = StrUtils.encodeHex(string,'%', charsFilename) ; - return encStr ; - } - - /** Encode using the rules for a path (e.g. ':' and '/' do not get encoded) */ - public static String encodeUriPath(String uri) - { - // Not perfect. - // Encode path. - // %-encode chars. - uri = StrUtils.encodeHex(uri, '%', charsPath) ; - return uri ; - } - - public static String decode(String string) - { - return StrUtils.decodeHex(string, '%') ; - } - - public static String encodeNonASCII(String string) - { - if ( ! containsNonASCII(string) ) - return string ; - - byte[] bytes = StrUtils.asUTF8bytes(string) ; - StringBuilder sw = new StringBuilder() ; - for ( byte b : bytes ) - { - // Signed bytes ... - if ( b > 0 ) - { - sw.append( (char) b ); - continue; - } - - int hi = ( b & 0xF0 ) >> 4; - int lo = b & 0xF; - sw.append( '%' ); - sw.append( Chars.hexDigitsUC[hi] ); - sw.append( Chars.hexDigitsUC[lo] ); - } - return sw.toString() ; - } - - public static boolean containsNonASCII(String string) - { - boolean clean = true ; - for ( int i = 0 ; i < string.length() ; i++ ) - { - char ch = string.charAt(i) ; - if ( ch >= 127 ) - return true; - } - return false ; - } -} http://git-wip-us.apache.org/repos/asf/jena/blob/d93f2383/jena-csv/src/main/java/riotcmdx/csv2rdf.java ---------------------------------------------------------------------- diff --git a/jena-csv/src/main/java/riotcmdx/csv2rdf.java b/jena-csv/src/main/java/riotcmdx/csv2rdf.java index 33795b1..eda3d8a 100644 --- a/jena-csv/src/main/java/riotcmdx/csv2rdf.java +++ b/jena-csv/src/main/java/riotcmdx/csv2rdf.java @@ -18,10 +18,10 @@ package riotcmdx; +import org.apache.jena.atlas.lib.Lib ; import org.apache.jena.atlas.web.ContentType ; import org.apache.jena.riot.Lang ; import org.apache.jena.riot.RDFLanguages ; -import org.apache.jena.sparql.util.Utils ; import riotcmd.CmdLangParse ; /** @@ -47,6 +47,6 @@ public class csv2rdf extends CmdLangParse{ @Override protected String getCommandName() { - return Utils.classShortName(csv2rdf.class) ; + return Lib.classShortName(csv2rdf.class) ; } } http://git-wip-us.apache.org/repos/asf/jena/blob/d93f2383/jena-fuseki1/src/main/java/org/apache/jena/fuseki/validation/DataValidator.java ---------------------------------------------------------------------- diff --git a/jena-fuseki1/src/main/java/org/apache/jena/fuseki/validation/DataValidator.java b/jena-fuseki1/src/main/java/org/apache/jena/fuseki/validation/DataValidator.java index a5a85da..3b7a752 100644 --- a/jena-fuseki1/src/main/java/org/apache/jena/fuseki/validation/DataValidator.java +++ b/jena-fuseki1/src/main/java/org/apache/jena/fuseki/validation/DataValidator.java @@ -206,6 +206,7 @@ public class DataValidator extends ValidatorBase } } + @SuppressWarnings("deprecation") private Tokenizer createTokenizer(HttpServletRequest httpRequest, HttpServletResponse httpResponse) throws Exception { Reader reader = null ; http://git-wip-us.apache.org/repos/asf/jena/blob/d93f2383/jena-fuseki1/src/test/java/org/apache/jena/fuseki/http/TestHttpOp.java ---------------------------------------------------------------------- diff --git a/jena-fuseki1/src/test/java/org/apache/jena/fuseki/http/TestHttpOp.java b/jena-fuseki1/src/test/java/org/apache/jena/fuseki/http/TestHttpOp.java index b9512af..60f2857 100644 --- a/jena-fuseki1/src/test/java/org/apache/jena/fuseki/http/TestHttpOp.java +++ b/jena-fuseki1/src/test/java/org/apache/jena/fuseki/http/TestHttpOp.java @@ -22,11 +22,11 @@ import java.io.IOException ; import org.apache.jena.atlas.io.IO ; import org.apache.jena.atlas.junit.BaseTest ; +import org.apache.jena.atlas.lib.IRILib ; import org.apache.jena.atlas.web.HttpException ; import org.apache.jena.atlas.web.TypedInputStream ; import org.apache.jena.fuseki.ServerTest ; import org.apache.jena.riot.WebContent ; -import org.apache.jena.riot.system.IRILib ; import org.apache.jena.riot.web.HttpOp ; import org.apache.jena.sparql.engine.http.Params ; import org.apache.jena.util.FileUtils ; http://git-wip-us.apache.org/repos/asf/jena/blob/d93f2383/jena-tdb/src/main/java/org/apache/jena/tdb/index/ext/ExtHash.java ---------------------------------------------------------------------- diff --git a/jena-tdb/src/main/java/org/apache/jena/tdb/index/ext/ExtHash.java b/jena-tdb/src/main/java/org/apache/jena/tdb/index/ext/ExtHash.java index fbe8046..f66b37e 100644 --- a/jena-tdb/src/main/java/org/apache/jena/tdb/index/ext/ExtHash.java +++ b/jena-tdb/src/main/java/org/apache/jena/tdb/index/ext/ExtHash.java @@ -31,7 +31,7 @@ import org.apache.jena.atlas.io.IndentedLineBuffer ; import org.apache.jena.atlas.io.IndentedWriter ; import org.apache.jena.atlas.lib.BitsLong ; import org.apache.jena.atlas.lib.Bytes ; -import org.apache.jena.sparql.util.Utils ; +import org.apache.jena.atlas.lib.Lib ; import org.apache.jena.tdb.base.StorageException ; import org.apache.jena.tdb.base.block.BlockMgr ; import org.apache.jena.tdb.base.block.BlockMgrFactory ; @@ -344,7 +344,7 @@ public final class ExtHash implements Index @Override public void clear() - { throw new UnsupportedOperationException("RangeIndex("+Utils.classShortName(this.getClass())+").clear") ; } + { throw new UnsupportedOperationException("RangeIndex("+Lib.classShortName(this.getClass())+").clear") ; } @Override public long size() http://git-wip-us.apache.org/repos/asf/jena/blob/d93f2383/jena-tdb/src/main/java/org/apache/jena/tdb/setup/StoreParamsCodec.java ---------------------------------------------------------------------- diff --git a/jena-tdb/src/main/java/org/apache/jena/tdb/setup/StoreParamsCodec.java b/jena-tdb/src/main/java/org/apache/jena/tdb/setup/StoreParamsCodec.java index b848584..c6b9614 100644 --- a/jena-tdb/src/main/java/org/apache/jena/tdb/setup/StoreParamsCodec.java +++ b/jena-tdb/src/main/java/org/apache/jena/tdb/setup/StoreParamsCodec.java @@ -50,7 +50,7 @@ import org.apache.jena.atlas.json.JsonParseException; import org.apache.jena.atlas.json.JsonArray ; import org.apache.jena.atlas.json.JsonBuilder ; import org.apache.jena.atlas.json.JsonObject ; -import org.apache.jena.sparql.util.Utils ; +import org.apache.jena.atlas.lib.Lib ; import org.apache.jena.tdb.TDBException ; import org.apache.jena.tdb.base.block.FileMode ; import org.apache.jena.tdb.base.file.Location ; @@ -209,6 +209,6 @@ public class StoreParamsCodec { builder.finishArray() ; return ; } - throw new TDBException("Class of value not recognized: "+Utils.classShortName(value.getClass())) ; + throw new TDBException("Class of value not recognized: "+Lib.classShortName(value.getClass())) ; } } http://git-wip-us.apache.org/repos/asf/jena/blob/d93f2383/jena-tdb/src/main/java/org/apache/jena/tdb/sys/TDBInternal.java ---------------------------------------------------------------------- diff --git a/jena-tdb/src/main/java/org/apache/jena/tdb/sys/TDBInternal.java b/jena-tdb/src/main/java/org/apache/jena/tdb/sys/TDBInternal.java index 75d9e49..5bd9e84 100644 --- a/jena-tdb/src/main/java/org/apache/jena/tdb/sys/TDBInternal.java +++ b/jena-tdb/src/main/java/org/apache/jena/tdb/sys/TDBInternal.java @@ -18,10 +18,10 @@ package org.apache.jena.tdb.sys; +import org.apache.jena.atlas.lib.Lib ; import org.apache.jena.graph.Node ; import org.apache.jena.query.Dataset ; import org.apache.jena.sparql.core.DatasetGraph ; -import org.apache.jena.sparql.util.Utils ; import org.apache.jena.tdb.TDBException ; import org.apache.jena.tdb.store.DatasetGraphTDB ; import org.apache.jena.tdb.store.NodeId ; @@ -128,7 +128,7 @@ public class TDBInternal { if ( datasetGraph instanceof DatasetGraphTransaction ) return ((DatasetGraphTransaction)datasetGraph).getBaseDatasetGraph() ; - throw new TDBException("Not a suitable DatasetGraph to get it's base storage: "+Utils.classShortName(datasetGraph.getClass())) ; + throw new TDBException("Not a suitable DatasetGraph to get it's base storage: "+Lib.classShortName(datasetGraph.getClass())) ; } } http://git-wip-us.apache.org/repos/asf/jena/blob/d93f2383/jena-tdb/src/main/java/tdb/CmdRewriteIndex.java ---------------------------------------------------------------------- diff --git a/jena-tdb/src/main/java/tdb/CmdRewriteIndex.java b/jena-tdb/src/main/java/tdb/CmdRewriteIndex.java index ca017f2..0c4a6fa 100644 --- a/jena-tdb/src/main/java/tdb/CmdRewriteIndex.java +++ b/jena-tdb/src/main/java/tdb/CmdRewriteIndex.java @@ -21,7 +21,7 @@ package tdb; import java.util.Iterator ; import org.apache.jena.atlas.lib.FileOps ; -import org.apache.jena.sparql.util.Utils ; +import org.apache.jena.atlas.lib.Lib ; import org.apache.jena.tdb.base.block.BlockMgr ; import org.apache.jena.tdb.base.block.BlockMgrFactory ; import org.apache.jena.tdb.base.file.FileSet ; @@ -44,7 +44,7 @@ public class CmdRewriteIndex // Usage: srcLocation dstLocation indexName if ( argv.length != 3 ) { - System.err.println("Usage: "+Utils.classShortName(CmdRewriteIndex.class)+" SrcLocation DstLocation IndexName") ; + System.err.println("Usage: "+Lib.classShortName(CmdRewriteIndex.class)+" SrcLocation DstLocation IndexName") ; System.exit(1) ; } http://git-wip-us.apache.org/repos/asf/jena/blob/d93f2383/jena-tdb/src/main/java/tdb/cmdline/CmdTDB.java ---------------------------------------------------------------------- diff --git a/jena-tdb/src/main/java/tdb/cmdline/CmdTDB.java b/jena-tdb/src/main/java/tdb/cmdline/CmdTDB.java index bf68e62..db98678 100644 --- a/jena-tdb/src/main/java/tdb/cmdline/CmdTDB.java +++ b/jena-tdb/src/main/java/tdb/cmdline/CmdTDB.java @@ -19,11 +19,11 @@ package tdb.cmdline; import org.apache.jena.Jena ; +import org.apache.jena.atlas.lib.Lib ; import org.apache.jena.atlas.logging.LogCtl ; import org.apache.jena.query.ARQ ; import org.apache.jena.query.Dataset ; import org.apache.jena.sparql.core.DatasetGraph ; -import org.apache.jena.sparql.util.Utils ; import org.apache.jena.tdb.TDB ; import org.apache.jena.tdb.base.file.Location ; import org.apache.jena.tdb.setup.DatasetBuilderStd ; @@ -80,6 +80,6 @@ public abstract class CmdTDB extends CmdARQ @Override protected String getCommandName() { - return Utils.className(this) ; + return Lib.className(this) ; } } http://git-wip-us.apache.org/repos/asf/jena/blob/d93f2383/jena-tdb/src/main/java/tdb/cmdline/CmdTDBGraph.java ---------------------------------------------------------------------- diff --git a/jena-tdb/src/main/java/tdb/cmdline/CmdTDBGraph.java b/jena-tdb/src/main/java/tdb/cmdline/CmdTDBGraph.java index 5ce9e2d..15aa61f 100644 --- a/jena-tdb/src/main/java/tdb/cmdline/CmdTDBGraph.java +++ b/jena-tdb/src/main/java/tdb/cmdline/CmdTDBGraph.java @@ -18,11 +18,11 @@ package tdb.cmdline; +import org.apache.jena.atlas.lib.Lib ; import org.apache.jena.graph.Node ; import org.apache.jena.graph.NodeFactory ; import org.apache.jena.query.Dataset ; import org.apache.jena.rdf.model.Model ; -import org.apache.jena.sparql.util.Utils ; import org.apache.jena.tdb.store.GraphTDB ; import arq.cmd.CmdException ; import arq.cmdline.ArgDecl ; @@ -74,7 +74,7 @@ public abstract class CmdTDBGraph extends CmdTDB @Override protected String getCommandName() { - return Utils.className(this) ; + return Lib.className(this) ; } } http://git-wip-us.apache.org/repos/asf/jena/blob/d93f2383/jena-tdb/src/main/java/tdb/tools/dumpbpt.java ---------------------------------------------------------------------- diff --git a/jena-tdb/src/main/java/tdb/tools/dumpbpt.java b/jena-tdb/src/main/java/tdb/tools/dumpbpt.java index 66d3343..4828a14 100644 --- a/jena-tdb/src/main/java/tdb/tools/dumpbpt.java +++ b/jena-tdb/src/main/java/tdb/tools/dumpbpt.java @@ -24,9 +24,9 @@ import java.util.Iterator ; import java.util.List ; import org.apache.jena.atlas.lib.ColumnMap ; +import org.apache.jena.atlas.lib.Lib ; import org.apache.jena.atlas.lib.Tuple ; import org.apache.jena.atlas.logging.LogCtl ; -import org.apache.jena.sparql.util.Utils ; import org.apache.jena.tdb.base.file.Location ; import org.apache.jena.tdb.base.record.Record ; import org.apache.jena.tdb.base.record.RecordFactory ; @@ -71,7 +71,7 @@ public class dumpbpt extends CmdGeneral { @Override protected String getCommandName() { - return Utils.className(this) ; + return Lib.className(this) ; } @Override http://git-wip-us.apache.org/repos/asf/jena/blob/d93f2383/jena-tdb/src/main/java/tdb/tools/dumpnodetable.java ---------------------------------------------------------------------- diff --git a/jena-tdb/src/main/java/tdb/tools/dumpnodetable.java b/jena-tdb/src/main/java/tdb/tools/dumpnodetable.java index a29157d..00b2762 100644 --- a/jena-tdb/src/main/java/tdb/tools/dumpnodetable.java +++ b/jena-tdb/src/main/java/tdb/tools/dumpnodetable.java @@ -24,13 +24,13 @@ 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.atlas.lib.Pair ; import org.apache.jena.atlas.logging.Log ; import org.apache.jena.atlas.logging.LogCtl ; import org.apache.jena.graph.Node ; import org.apache.jena.graph.Node_Literal ; import org.apache.jena.sparql.util.FmtUtils ; -import org.apache.jena.sparql.util.Utils ; import org.apache.jena.tdb.StoreConnection ; import org.apache.jena.tdb.base.file.Location ; import org.apache.jena.tdb.setup.Build ; @@ -175,7 +175,7 @@ public class dumpnodetable 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-tdb/src/main/java/tdb/tools/tdbgenindex.java ---------------------------------------------------------------------- diff --git a/jena-tdb/src/main/java/tdb/tools/tdbgenindex.java b/jena-tdb/src/main/java/tdb/tools/tdbgenindex.java index 7325543..2114ef7 100644 --- a/jena-tdb/src/main/java/tdb/tools/tdbgenindex.java +++ b/jena-tdb/src/main/java/tdb/tools/tdbgenindex.java @@ -20,8 +20,8 @@ package tdb.tools ; import java.util.Iterator ; +import org.apache.jena.atlas.lib.Lib ; import org.apache.jena.atlas.lib.Tuple ; -import org.apache.jena.sparql.util.Utils ; import org.apache.jena.tdb.base.file.Location ; import org.apache.jena.tdb.store.NodeId ; import org.apache.jena.tdb.store.tupletable.TupleIndex ; @@ -34,7 +34,7 @@ public class tdbgenindex { public static void main(String... argv) { // Usage: srcLocation indexName dstLocation indexName if ( argv.length != 4 ) { - System.err.println("Usage: " + Utils.classShortName(tdbgenindex.class) + " srcLocation srcIndex dstLocation dstIndex") ; + System.err.println("Usage: " + Lib.classShortName(tdbgenindex.class) + " srcLocation srcIndex dstLocation dstIndex") ; System.exit(1) ; } http://git-wip-us.apache.org/repos/asf/jena/blob/d93f2383/jena-tdb/src/test/java/org/apache/jena/tdb/index/bplustree/CmdTestBPlusTreeRewriter.java ---------------------------------------------------------------------- diff --git a/jena-tdb/src/test/java/org/apache/jena/tdb/index/bplustree/CmdTestBPlusTreeRewriter.java b/jena-tdb/src/test/java/org/apache/jena/tdb/index/bplustree/CmdTestBPlusTreeRewriter.java index fbbbaff..18318a5 100644 --- a/jena-tdb/src/test/java/org/apache/jena/tdb/index/bplustree/CmdTestBPlusTreeRewriter.java +++ b/jena-tdb/src/test/java/org/apache/jena/tdb/index/bplustree/CmdTestBPlusTreeRewriter.java @@ -18,9 +18,9 @@ package org.apache.jena.tdb.index.bplustree; +import org.apache.jena.atlas.lib.Lib ; import org.apache.jena.atlas.lib.RandomLib ; import org.apache.jena.atlas.logging.LogCtl ; -import org.apache.jena.sparql.util.Utils ; import org.apache.jena.tdb.base.record.RecordFactory ; import org.apache.jena.tdb.index.bplustree.BPlusTreeRewriter ; import org.apache.jena.tdb.sys.SystemTDB ; @@ -34,7 +34,7 @@ public class CmdTestBPlusTreeRewriter // Usage: maxOrder maxSize NumTests if ( argv.length != 3 ) { - System.err.println("Usage: "+Utils.classShortName(CmdTestBPlusTreeRewriter.class)+" maxOrder maxSize NumTests") ; + System.err.println("Usage: "+Lib.classShortName(CmdTestBPlusTreeRewriter.class)+" maxOrder maxSize NumTests") ; System.exit(1) ; }
