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 2017/04/26 09:09:15 UTC
[01/15] jena git commit: Merge pull request #3 from apache/master
Repository: jena
Updated Branches:
refs/heads/master ea5e358e2 -> e05692f5c
Merge pull request #3 from apache/master
update from upstream
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/b289446e
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/b289446e
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/b289446e
Branch: refs/heads/master
Commit: b289446ef53f1f4f5ef56cebd235bc1eb830d4ec
Parents: bcb20c6 e07054d
Author: Chris Dollin <eh...@gmail.com>
Authored: Tue Mar 14 15:45:33 2017 +0000
Committer: GitHub <no...@github.com>
Committed: Tue Mar 14 15:45:33 2017 +0000
----------------------------------------------------------------------
.travis.yml | 9 +
BUILD.md | 66 +
CONTRIBUTING.md | 120 ++
LICENSE | 6 +-
NOTICE | 2 +-
apache-jena-libs/pom.xml | 12 +-
apache-jena-osgi/jena-osgi-features/pom.xml | 2 +-
.../src/main/resources/features.xml | 29 +-
apache-jena-osgi/jena-osgi-test/pom.xml | 8 +-
apache-jena-osgi/jena-osgi/pom.xml | 19 +-
.../src/main/resources/META-INF/NOTICE | 2 +-
apache-jena-osgi/pom.xml | 4 +-
apache-jena/DEPENDENCIES | 21 -
apache-jena/LICENSE | 274 ----
apache-jena/NOTICE | 60 -
apache-jena/README | 92 --
apache-jena/assembly-jena-zip.xml | 28 +-
apache-jena/bin/tdbloader2 | 1 -
apache-jena/bin/tdbloader2index | 22 +-
apache-jena/dist/LICENSE | 274 ++++
apache-jena/dist/NOTICE | 60 +
apache-jena/dist/README | 127 ++
apache-jena/pom.xml | 50 +-
jena-arq/NOTICE | 2 +-
jena-arq/pom.xml | 12 +-
.../src-examples/arq/examples/AlgebraExec.java | 2 +-
.../arq/examples/ExampleDBpedia3.java | 6 +-
.../arq/examples/bgpmatching/StageAltMain.java | 3 +-
.../examples/propertyfunction/localname.java | 2 +-
.../arq/examples/riot/ExJsonLD.java | 380 ++++++
.../arq/examples/riot/ExRIOT_2.java | 48 +-
.../arq/examples/riot/ExRIOT_6.java | 2 +-
.../update/UpdateExecuteOperations.java | 3 +-
.../apache/jena/atlas/data/AbstractDataBag.java | 27 +-
.../org/apache/jena/atlas/data/DataBag.java | 8 +-
.../apache/jena/atlas/data/SortedDataBag.java | 2 +-
.../java/org/apache/jena/atlas/json/JSON.java | 37 +-
.../org/apache/jena/atlas/json/JsonBuilder.java | 96 +-
.../org/apache/jena/atlas/json/io/JSWriter.java | 54 +-
.../apache/jena/atlas/json/io/parser/JSONP.java | 9 +-
.../atlas/json/io/parser/JSONParserBase.java | 9 +-
.../atlas/json/io/parser/TokenizerJSON.java | 36 +-
.../java/org/apache/jena/atlas/test/Gen.java | 80 +-
.../apache/jena/atlas/web/TypedInputStream.java | 14 +-
.../auth/AbstractCredentialsAuthenticator.java | 114 --
.../web/auth/AbstractScopedAuthenticator.java | 151 ---
.../atlas/web/auth/ApacheModAuthFormLogin.java | 49 -
.../atlas/web/auth/DelegatingAuthenticator.java | 89 --
.../apache/jena/atlas/web/auth/FormLogin.java | 120 --
.../jena/atlas/web/auth/FormsAuthenticator.java | 202 ---
.../jena/atlas/web/auth/HttpAuthenticator.java | 69 --
.../web/auth/PreemptiveBasicAuthenticator.java | 109 --
.../atlas/web/auth/ScopedAuthenticator.java | 101 --
.../atlas/web/auth/ScopedNTAuthenticator.java | 137 --
.../atlas/web/auth/ServiceAuthenticator.java | 129 --
.../atlas/web/auth/SimpleAuthenticator.java | 78 --
.../atlas/web/auth/SimpleNTAuthenticator.java | 71 --
.../main/java/org/apache/jena/query/ARQ.java | 9 +-
.../jena/query/DatasetAccessorFactory.java | 10 +-
.../jena/query/ParameterizedSparqlString.java | 10 +
.../jena/query/QueryExecutionFactory.java | 48 +-
.../apache/jena/query/ResultSetCloseable.java | 54 +
.../org/apache/jena/query/ResultSetFactory.java | 26 +-
.../apache/jena/query/ResultSetFormatter.java | 22 +-
.../org/apache/jena/query/SortCondition.java | 2 +-
.../apache/jena/riot/JsonLDWriteContext.java | 119 ++
.../java/org/apache/jena/riot/RDFDataMgr.java | 182 +--
.../java/org/apache/jena/riot/RDFFormat.java | 67 +-
.../java/org/apache/jena/riot/RDFLanguages.java | 15 +-
.../java/org/apache/jena/riot/RDFParser.java | 276 +++++
.../org/apache/jena/riot/RDFParserBuilder.java | 437 +++++++
.../org/apache/jena/riot/RDFParserRegistry.java | 50 +-
.../org/apache/jena/riot/RDFWriterRegistry.java | 75 +-
.../main/java/org/apache/jena/riot/RIOT.java | 10 +
.../org/apache/jena/riot/ReaderRIOTFactory.java | 10 +-
.../java/org/apache/jena/riot/ResultSetMgr.java | 2 +-
.../main/java/org/apache/jena/riot/SysRIOT.java | 24 +-
.../jena/riot/adapters/AdapterRDFWriter.java | 14 +-
.../jena/riot/adapters/RDFWriterRIOT.java | 14 +-
.../jena/riot/checker/CheckerLiterals.java | 82 +-
.../org/apache/jena/riot/lang/JsonLDReader.java | 39 +-
.../org/apache/jena/riot/lang/LabelToNode.java | 2 +-
.../java/org/apache/jena/riot/lang/LangCSV.java | 2 +-
.../org/apache/jena/riot/lang/LangEngine.java | 2 +-
.../org/apache/jena/riot/lang/LangNTriples.java | 25 +-
.../org/apache/jena/riot/lang/LangNTuple.java | 75 +-
.../org/apache/jena/riot/lang/LangRDFJSON.java | 4 +-
.../apache/jena/riot/lang/LangTurtleBase.java | 8 +-
.../apache/jena/riot/out/JenaRDF2JSONLD.java | 100 --
.../org/apache/jena/riot/out/JsonLDWriter.java | 173 ---
.../org/apache/jena/riot/system/FactoryRDF.java | 3 +
.../jena/riot/system/FactoryRDFCaching.java | 6 +
.../apache/jena/riot/system/FactoryRDFStd.java | 6 +-
.../apache/jena/riot/system/IRIResolver.java | 9 +-
.../org/apache/jena/riot/system/InitRIOT.java | 1 +
.../jena/riot/system/IteratorStreamRDFText.java | 4 +-
.../org/apache/jena/riot/system/MakerRDF.java | 77 ++
.../apache/jena/riot/system/MakerRDFStd.java | 313 +++++
.../apache/jena/riot/system/ParserProfile.java | 77 +-
.../jena/riot/system/ParserProfileBase.java | 9 -
.../jena/riot/system/ParserProfileChecker.java | 13 +-
.../org/apache/jena/riot/system/PrefixMap.java | 6 +
.../apache/jena/riot/system/PrefixMapBase.java | 7 +
.../apache/jena/riot/system/PrefixMapNull.java | 4 +
.../jena/riot/system/PrefixMapUnmodifiable.java | 2 +-
.../jena/riot/system/PrefixMapWrapper.java | 43 +-
.../org/apache/jena/riot/system/Prologue.java | 5 +-
.../org/apache/jena/riot/system/RiotLib.java | 21 +-
.../java/org/apache/jena/riot/system/SNode.java | 53 +
.../java/org/apache/jena/riot/system/SQuad.java | 62 +
.../org/apache/jena/riot/system/STriple.java | 59 +
.../org/apache/jena/riot/system/Serializer.java | 58 +
.../apache/jena/riot/system/SerializerRDF.java | 73 ++
.../org/apache/jena/riot/system/StreamOps.java | 9 +-
.../apache/jena/riot/system/StreamRDFLib.java | 62 +-
.../jena/riot/system/stream/LocatorStdin.java | 2 +-
.../jena/riot/system/stream/StreamManager.java | 32 +-
.../org/apache/jena/riot/tokens/StringType.java | 31 +
.../java/org/apache/jena/riot/tokens/Token.java | 84 +-
.../org/apache/jena/riot/tokens/TokenType.java | 10 +-
.../apache/jena/riot/tokens/TokenizerText.java | 225 ++--
.../org/apache/jena/riot/web/HttpNames.java | 2 +
.../java/org/apache/jena/riot/web/HttpOp.java | 432 ++-----
.../java/org/apache/jena/riot/web/LangTag.java | 52 +-
.../apache/jena/riot/writer/JenaRDF2JSONLD.java | 101 ++
.../apache/jena/riot/writer/JsonLDWriter.java | 422 +++++++
.../apache/jena/riot/writer/TurtleShell.java | 32 +-
.../org/apache/jena/sparql/ARQConstants.java | 25 +-
.../java/org/apache/jena/sparql/SystemARQ.java | 107 +-
.../jena/sparql/algebra/AlgebraGenerator.java | 2 +-
.../org/apache/jena/sparql/algebra/OpVars.java | 27 +-
.../apache/jena/sparql/algebra/OpWalker.java | 34 +-
.../sparql/algebra/TransformUnionQuery.java | 2 +-
.../apache/jena/sparql/algebra/op/OpGroup.java | 4 +
.../optimize/ExprTransformConstantFold.java | 3 +-
.../jena/sparql/algebra/optimize/Optimize.java | 31 +-
.../sparql/algebra/optimize/OptimizeStd.java | 293 -----
.../algebra/optimize/OptimizerMinimal.java | 46 +
.../sparql/algebra/optimize/OptimizerStd.java | 295 +++++
.../optimize/TransformEliminateAssignments.java | 7 +-
.../optimize/TransformFilterEquality.java | 4 +-
.../optimize/TransformFilterImplicitJoin.java | 5 +-
.../optimize/TransformFilterInequality.java | 5 +-
.../optimize/TransformFilterPlacement.java | 103 +-
.../optimize/TransformImplicitLeftJoin.java | 5 +-
.../optimize/TransformPropertyFunction.java | 20 +-
.../optimize/TransformRemoveAssignment.java | 2 +-
.../algebra/walker/ApplyTransformVisitor.java | 14 +-
.../algebra/walker/ElementWalker_New.java | 2 +
.../sparql/algebra/walker/WalkerVisitor.java | 2 +-
.../algebra/walker/WalkerVisitorVisible.java | 8 +-
.../apache/jena/sparql/core/BasicPattern.java | 120 +-
.../jena/sparql/core/DatasetGraphMapLink.java | 9 +-
.../jena/sparql/core/DatasetGraphReadOnly.java | 38 +-
.../apache/jena/sparql/core/DatasetImpl.java | 2 +
.../org/apache/jena/sparql/core/GraphView.java | 56 +
.../java/org/apache/jena/sparql/core/Quad.java | 25 +-
.../apache/jena/sparql/core/QuadPattern.java | 5 +-
.../java/org/apache/jena/sparql/core/Var.java | 4 +
.../sparql/core/assembler/AssemblerUtils.java | 7 +-
.../sparql/core/mem/DatasetGraphInMemory.java | 60 +-
.../jena/sparql/core/mem/PMapTupleTable.java | 6 +-
.../org/apache/jena/sparql/engine/Rename.java | 88 +-
.../sparql/engine/ResultSetCheckCondition.java | 6 +-
.../jena/sparql/engine/ResultSetWrapper.java | 74 ++
.../engine/binding/BindingInputStream.java | 26 +-
.../sparql/engine/binding/BindingUtils.java | 15 +
.../jena/sparql/engine/http/HttpQuery.java | 164 +--
.../apache/jena/sparql/engine/http/Params.java | 49 +-
.../sparql/engine/http/QueryEngineHTTP.java | 190 ++-
.../apache/jena/sparql/engine/http/Service.java | 32 +-
.../jena/sparql/engine/iterator/QueryIter2.java | 1 +
.../engine/iterator/QueryIter2LoopOnLeft.java | 2 +-
.../engine/iterator/QueryIterCommonParent.java | 2 +-
.../engine/iterator/QueryIterDistinct.java | 2 +-
.../iterator/QueryIterDistinctReduced.java | 3 +-
.../sparql/engine/iterator/QueryIterGroup.java | 33 +-
.../engine/iterator/QueryIterRepeatApply.java | 2 +-
.../sparql/engine/iterator/QueryIterSub.java | 2 +-
.../sparql/engine/iterator/QueryIterTopN.java | 3 +-
.../engine/iterator/QueryIteratorBase.java | 14 +-
.../engine/join/AbstractIterHashJoin.java | 6 +-
.../apache/jena/sparql/engine/join/Join.java | 6 +-
.../apache/jena/sparql/engine/join/JoinKey.java | 14 +-
.../sparql/engine/main/LeftJoinClassifier.java | 32 +-
.../sparql/engine/main/QueryEngineMain.java | 9 +-
.../engine/main/StageGeneratorGeneric.java | 2 +-
.../jena/sparql/engine/main/VarFinder.java | 7 +-
.../engine/optimizer/reorder/ReorderFixed.java | 22 +-
.../optimizer/reorder/ReorderProcIndexes.java | 2 +-
.../ReorderTransformationSubstitution.java | 176 ++-
.../org/apache/jena/sparql/expr/E_Bound.java | 12 +-
.../java/org/apache/jena/sparql/expr/Expr.java | 18 +-
.../org/apache/jena/sparql/expr/ExprLib.java | 3 +-
.../org/apache/jena/sparql/expr/ExprList.java | 12 +-
.../org/apache/jena/sparql/expr/ExprNode.java | 13 +-
.../org/apache/jena/sparql/expr/ExprVars.java | 143 +--
.../apache/jena/sparql/expr/ExprVisitor.java | 5 +-
.../jena/sparql/expr/ExprVisitorBase.java | 2 +
.../org/apache/jena/sparql/expr/NodeValue.java | 21 +-
.../sparql/expr/nodevalue/NodeFunctions.java | 25 +-
.../jena/sparql/expr/nodevalue/NodeValueDT.java | 3 +-
.../jena/sparql/function/library/sprintf.java | 2 +-
.../jena/sparql/function/library/strjoin.java | 9 +-
.../apache/jena/sparql/graph/GraphFactory.java | 3 +
.../sparql/graph/GraphPrefixesProjection.java | 10 +-
.../apache/jena/sparql/graph/GraphReadOnly.java | 12 +-
.../jena/sparql/graph/NodeTransformExpr.java | 63 +
.../jena/sparql/graph/NodeTransformLib.java | 83 +-
.../jena/sparql/graph/NodeTransformOp.java | 249 ++--
.../jena/sparql/lang/ParserARQUpdate.java | 2 +-
.../jena/sparql/lang/ParserSPARQL11Update.java | 2 +-
.../apache/jena/sparql/lang/SyntaxVarScope.java | 2 +-
.../apache/jena/sparql/lang/arq/ARQParser.java | 2 +-
.../org/apache/jena/sparql/lib/Metadata.java | 4 +-
.../org/apache/jena/sparql/mgt/Explain.java | 20 +-
.../jena/sparql/modify/UpdateProcessRemote.java | 15 +-
.../sparql/modify/UpdateProcessRemoteBase.java | 74 +-
.../sparql/modify/UpdateProcessRemoteForm.java | 21 +-
.../java/org/apache/jena/sparql/path/P_Alt.java | 27 +-
.../org/apache/jena/sparql/path/P_Distinct.java | 36 +-
.../apache/jena/sparql/path/P_FixedLength.java | 43 +-
.../org/apache/jena/sparql/path/P_Inverse.java | 36 +-
.../org/apache/jena/sparql/path/P_Link.java | 42 +-
.../java/org/apache/jena/sparql/path/P_Mod.java | 92 +-
.../org/apache/jena/sparql/path/P_Multi.java | 38 +-
.../apache/jena/sparql/path/P_NegPropSet.java | 49 +-
.../apache/jena/sparql/path/P_OneOrMore1.java | 24 +-
.../apache/jena/sparql/path/P_OneOrMoreN.java | 24 +-
.../org/apache/jena/sparql/path/P_Path0.java | 17 +-
.../org/apache/jena/sparql/path/P_Path1.java | 15 +-
.../org/apache/jena/sparql/path/P_Path2.java | 24 +-
.../apache/jena/sparql/path/P_ReverseLink.java | 30 +-
.../java/org/apache/jena/sparql/path/P_Seq.java | 26 +-
.../org/apache/jena/sparql/path/P_Shortest.java | 33 +-
.../apache/jena/sparql/path/P_ZeroOrMore1.java | 24 +-
.../apache/jena/sparql/path/P_ZeroOrMoreN.java | 24 +-
.../apache/jena/sparql/path/P_ZeroOrOne.java | 24 +-
.../org/apache/jena/sparql/path/PathLib.java | 20 +-
.../jena/sparql/path/PathPropertyFunction.java | 19 +-
.../org/apache/jena/sparql/path/PathWriter.java | 174 +--
.../jena/sparql/path/eval/PathEngine1.java | 4 +-
.../jena/sparql/path/eval/PathEngineN.java | 6 +-
.../jena/sparql/path/eval/PathEngineSPARQL.java | 20 +-
.../apache/jena/sparql/path/eval/PathEval.java | 2 -
.../pfunction/StandardPropertyFunctions.java | 6 +-
.../sparql/pfunction/library/listMember.java | 5 +-
.../sparql/resultset/JSONInputIterator.java | 10 +-
.../jena/sparql/resultset/ResultSetMem.java | 4 +
.../jena/sparql/resultset/XMLInputStAX.java | 5 +-
.../jena/sparql/serializer/FmtExprSPARQL.java | 5 +
.../java/org/apache/jena/sparql/sse/SSE.java | 243 +++-
.../jena/sparql/sse/builders/BuilderOp.java | 12 +-
.../jena/sparql/sse/writers/WriterExpr.java | 5 +
.../jena/sparql/sse/writers/WriterNode.java | 34 +-
.../jena/sparql/syntax/ElementService.java | 2 +-
.../org/apache/jena/sparql/syntax/Template.java | 4 +-
.../ApplyElementTransformVisitor.java | 224 ++++
.../syntaxtransform/ElementTransformer.java | 206 +--
.../syntaxtransform/QueryTransformOps.java | 258 ++--
.../syntaxtransform/UpdateTransformOps.java | 2 +-
.../org/apache/jena/sparql/util/Context.java | 7 +-
.../apache/jena/sparql/util/DatasetUtils.java | 144 +--
.../jena/sparql/util/NodeFactoryExtra.java | 204 ++-
.../apache/jena/sparql/util/PrefixMapping2.java | 17 +
.../jena/sparql/util/graph/GraphUtils.java | 142 +--
.../org/apache/jena/system/ThreadAction.java | 4 +-
.../main/java/org/apache/jena/system/Txn.java | 8 +-
.../jena/update/UpdateExecutionFactory.java | 52 +-
.../jena/web/DatasetGraphAccessorHTTP.java | 51 +-
jena-arq/src/main/resources/META-INF/NOTICE | 2 +-
.../jena/atlas/data/TestDistinctDataNet.java | 2 +-
.../org/apache/jena/atlas/json/TS_JSON.java | 1 +
.../org/apache/jena/atlas/json/TestJson.java | 3 +-
.../org/apache/jena/atlas/json/TestJsonAPI.java | 46 +
.../apache/jena/atlas/json/TestJsonBuilder.java | 47 +-
.../org/apache/jena/atlas/json/TestJsonExt.java | 6 +-
.../java/org/apache/jena/riot/TS_LangSuite.java | 2 +-
.../org/apache/jena/riot/TS_RiotGeneral.java | 1 +
.../apache/jena/riot/TestJenaReaderRIOT.java | 5 +-
.../org/apache/jena/riot/TestJsonLDReader.java | 147 +++
.../org/apache/jena/riot/TestRDFParser.java | 186 +++
.../jena/riot/lang/ParserTestBaseLib.java | 20 +-
.../org/apache/jena/riot/lang/TestLangCSV.java | 3 +-
.../apache/jena/riot/lang/TestLangNTriples.java | 3 +-
.../apache/jena/riot/lang/TestLangNTuples.java | 2 +-
.../jena/riot/lang/TestPipedRDFIterators.java | 2 +-
.../jena/riot/stream/TestStreamManager.java | 3 +-
.../jena/riot/system/AbstractTestPrefixMap.java | 3 +-
.../apache/jena/riot/system/TS_RiotSystem.java | 3 +-
.../jena/riot/system/TestJsonLDReadWrite.java | 4 +-
.../jena/riot/system/TestLangRegistration.java | 7 +-
.../jena/riot/system/TestSerializable.java | 168 +++
.../jena/riot/thrift/TestThriftSetup.java | 2 +
.../apache/jena/riot/tokens/TestTokenizer.java | 157 ++-
.../jena/riot/writer/TestJsonLDWriter.java | 497 ++++++++
.../jena/sparql/algebra/TestClassify.java | 14 +-
.../sparql/algebra/optimize/TestOptimizer.java | 65 +-
.../optimize/TestTransformFilterPlacement.java | 56 +-
.../algebra/optimize/TestTransformFilters.java | 2 +-
.../sparql/algebra/optimize/TestVarRename.java | 234 +++-
.../org/apache/jena/sparql/api/TestAPI.java | 49 +-
.../jena/sparql/core/mem/TS_DatasetTxnMem.java | 4 +-
.../mem/TestDatasetGraphInMemoryIsolation.java | 30 +
.../mem/TestDatasetGraphInMemoryPromote.java | 65 +
.../engine/binding/TestBindingStreams.java | 9 +
.../jena/sparql/engine/http/TestService.java | 53 +-
.../iterator/AbstractTestDistinctReduced.java | 4 +-
.../engine/iterator/TS_QueryIterators.java | 1 +
.../engine/iterator/TestCancelDistinct.java | 8 +-
.../iterator/TestSortedDataBagCancellation.java | 10 +-
.../jena/sparql/expr/TestExpressions3.java | 4 +-
.../org/apache/jena/sparql/junit/QueryTest.java | 21 +-
.../org/apache/jena/sparql/junit/TestItem.java | 6 +-
.../jena/sparql/negation/TestGraphDeltas.java | 2 +-
.../org/apache/jena/sparql/path/TestPath.java | 88 +-
.../jena/sparql/syntax/TestSSE_Forms.java | 19 +-
.../syntaxtransform/TestSyntaxTransform.java | 9 +-
.../transaction/AbstractTestTransPromote.java | 423 +++++++
.../AbstractTestTransactionIsolation.java | 51 +
.../AbstractTestTransactionLifecycle.java | 2 -
.../java/org/apache/jena/system/TestTxn.java | 52 +-
.../apache/jena/system/TestTxnLifecycle.java | 24 +-
.../org/apache/jena/system/TestTxnThread.java | 4 +-
jena-arq/src/test/resources/test.csv | 6 +-
.../results-construct-quad-syntax-3.ttl | 2 +-
.../results-construct-quad-syntax-7.ttl | 2 +-
.../Lang/TrigStd/trig-syntax-bad-list-02.trig | 2 +-
jena-arq/testing/RIOT/Parser/data.rdf | 5 +
jena-arq/testing/RIOT/Parser/data.ttl | 5 +
jena-arq/testing/RIOT/Parser/data.unknown | 5 +
jena-base/NOTICE | 2 +-
jena-base/pom.xml | 6 +-
.../apache/jena/atlas/RuntimeIOException.java | 6 +-
.../org/apache/jena/atlas/io/BlockUTF8.java | 18 +-
.../main/java/org/apache/jena/atlas/io/IO.java | 29 +-
.../org/apache/jena/atlas/io/InStreamUTF8.java | 6 -
.../apache/jena/atlas/io/IndentedWriter.java | 40 +-
.../org/apache/jena/atlas/iterator/Iter.java | 4 +-
.../jena/atlas/iterator/IteratorConcat.java | 5 +-
.../org/apache/jena/atlas/lib/AlarmClock.java | 2 +-
.../org/apache/jena/atlas/lib/CacheFactory.java | 2 +-
.../java/org/apache/jena/atlas/lib/Chars.java | 38 +
.../apache/jena/atlas/lib/CollectionUtils.java | 7 +-
.../main/java/org/apache/jena/atlas/lib/DS.java | 45 -
.../org/apache/jena/atlas/lib/ListUtils.java | 16 +
.../java/org/apache/jena/atlas/lib/Ref.java | 54 -
.../apache/jena/atlas/lib/RefCountingMap.java | 4 +-
.../java/org/apache/jena/atlas/lib/RefLong.java | 38 -
.../jena/atlas/lib/ReverseComparator.java | 38 -
.../org/apache/jena/atlas/lib/SetUtils.java | 32 +-
.../org/apache/jena/atlas/lib/StrUtils.java | 249 ++--
.../jena/atlas/lib/cache/CacheSetImpl.java | 2 +-
.../org/apache/jena/atlas/lib/tuple/Tuple.java | 7 +-
.../apache/jena/atlas/lib/tuple/TupleList.java | 4 +-
.../apache/jena/atlas/lib/tuple/TupleMap.java | 19 +-
.../java/org/apache/jena/atlas/logging/Log.java | 30 +
.../org/apache/jena/atlas/logging/LogCtl.java | 2 +-
.../logging/java/ConsoleHandlerStream.java | 2 +-
jena-base/src/main/resources/NOTICE | 2 +-
.../atlas/io/AbstractTestPeekInputStream.java | 11 +-
.../jena/atlas/io/AbstractTestPeekReader.java | 11 +-
.../org/apache/jena/atlas/io/TestBlockUTF8.java | 1 -
.../apache/jena/atlas/iterator/TestIter.java | 2 +-
.../jena/atlas/iterator/TestIteratorPeek.java | 2 +-
.../atlas/iterator/TestIteratorWithBuffer.java | 2 +-
.../atlas/iterator/TestIteratorWithHistory.java | 2 +-
.../org/apache/jena/atlas/junit/BaseTest.java | 9 +-
.../java/org/apache/jena/atlas/lib/TS_Lib.java | 2 -
.../org/apache/jena/atlas/lib/TestBitsInt.java | 11 +-
.../org/apache/jena/atlas/lib/TestBitsLong.java | 11 +-
.../apache/jena/atlas/lib/TestEscapeStr.java | 2 +-
.../java/org/apache/jena/atlas/lib/TestHex.java | 2 +-
.../apache/jena/atlas/lib/TestListUtils.java | 3 +-
.../jena/atlas/lib/TestRefCountingMap.java | 2 +-
.../org/apache/jena/atlas/lib/TestRefLong.java | 70 --
.../jena/atlas/lib/TestReverseComparator.java | 91 --
.../org/apache/jena/atlas/lib/TestSetUtils.java | 12 +-
.../jena/atlas/lib/cache/TestCacheSimple.java | 6 +-
.../apache/jena/atlas/lib/tuple/TestTuple.java | 2 +-
.../jena/atlas/lib/tuple/TestTupleMap.java | 4 +-
jena-cmds/pom.xml | 12 +-
.../java/arq/cmdline/ModDatasetAssembler.java | 15 +-
.../java/arq/cmdline/ModDatasetGeneral.java | 67 +-
jena-cmds/src/main/java/arq/query.java | 114 +-
jena-cmds/src/main/java/arq/sparql.java | 2 +-
jena-cmds/src/main/java/arq/update.java | 99 +-
.../src/main/java/riotcmd/CmdLangParse.java | 260 ++--
jena-cmds/src/main/java/riotcmd/infer.java | 2 +-
jena-cmds/src/main/java/tdb/tdbreorder.java | 54 +-
jena-core/NOTICE | 2 +-
jena-core/pom.xml | 13 +-
.../jena/examples/rdf/Tutorial06.java | 2 +-
.../assembler/assemblers/AssemblerGroup.java | 26 +-
.../assembler/assemblers/OntModelAssembler.java | 4 +-
.../assemblers/OntModelSpecAssembler.java | 5 +-
.../jena/datatypes/xsd/XSDbase64Binary.java | 5 +-
.../apache/jena/datatypes/xsd/XSDhexBinary.java | 5 +-
.../datatypes/xsd/impl/XSDBaseNumericType.java | 2 +-
.../java/org/apache/jena/enhanced/EnhGraph.java | 61 +-
.../java/org/apache/jena/graph/BlankNodeId.java | 50 +-
.../org/apache/jena/graph/Capabilities.java | 29 +-
.../java/org/apache/jena/graph/GraphEvents.java | 2 +-
.../java/org/apache/jena/graph/GraphUtil.java | 170 +--
.../main/java/org/apache/jena/graph/Node.java | 27 +-
.../java/org/apache/jena/graph/NodeFactory.java | 3 +
.../apache/jena/graph/TransactionHandler.java | 43 +-
.../main/java/org/apache/jena/graph/Triple.java | 28 +-
.../compose/PolyadicPrefixMappingImpl.java | 10 +
.../jena/graph/impl/TransactionHandlerBase.java | 51 +-
.../apache/jena/graph/impl/WrappedGraph.java | 4 +-
.../org/apache/jena/graph/impl/package.html | 6 +-
.../java/org/apache/jena/n3/IRIResolver.java | 231 ----
.../java/org/apache/jena/n3/JenaReaderBase.java | 2 +-
.../java/org/apache/jena/n3/N3IRIResolver.java | 231 ++++
.../org/apache/jena/n3/N3JenaWriterCommon.java | 5 +-
.../org/apache/jena/n3/turtle/ParserBase.java | 6 +-
.../org/apache/jena/ontology/impl/package.html | 2 +-
.../java/org/apache/jena/rdf/model/Model.java | 49 +-
.../org/apache/jena/rdf/model/ModelFactory.java | 4 +
.../org/apache/jena/rdf/model/Resource.java | 33 +
.../apache/jena/rdf/model/impl/ModelCom.java | 105 +-
.../jena/rdf/model/impl/PropertyImpl.java | 48 +-
.../jena/rdf/model/impl/RDFReaderFImpl.java | 4 +-
.../jena/rdf/model/impl/RDFWriterFImpl.java | 4 +-
.../jena/rdf/model/impl/ResourceImpl.java | 22 +-
.../jena/rdfxml/xmlinput/impl/XMLHandler.java | 2 +-
.../jena/rdfxml/xmloutput/impl/Abbreviated.java | 13 -
.../reasoner/rulesys/builtins/MakeSkolem.java | 7 +-
.../rulesys/impl/ConsumerChoicePointFrame.java | 7 +-
.../jena/reasoner/rulesys/impl/FRuleEngine.java | 1 -
.../jena/reasoner/rulesys/impl/package.html | 12 +-
.../transitiveReasoner/TransitiveEngine.java | 4 +-
.../org/apache/jena/shared/PrefixMapping.java | 15 +-
.../apache/jena/shared/RandomOrderGraph.java | 16 +-
.../apache/jena/shared/impl/JenaParameters.java | 2 +-
.../jena/shared/impl/PrefixMappingImpl.java | 8 +
.../java/org/apache/jena/system/JenaSystem.java | 2 +-
.../java/org/apache/jena/system/Serializer.java | 84 ++
.../java/org/apache/jena/util/MonitorGraph.java | 6 +-
.../java/org/apache/jena/util/MonitorModel.java | 4 +-
.../java/org/apache/jena/util/OneToManyMap.java | 2 +-
.../java/org/apache/jena/vocabulary/OWL.java | 171 +--
.../java/org/apache/jena/vocabulary/RDF.java | 128 +-
.../java/org/apache/jena/vocabulary/RDFS.java | 95 +-
.../java/org/apache/jena/vocabulary/VCARD4.java | 221 ++++
jena-core/src/main/resources/META-INF/NOTICE | 2 +-
.../apache/jena/graph/GraphContractTest.java | 270 ++--
.../graph/TransactionHandlerContractTest.java | 52 +-
.../apache/jena/graph/compose/DeltaTest.java | 2 +-
.../jena/graph/compose/DifferenceTest.java | 2 +-
.../jena/graph/compose/IntersectionTest.java | 2 +-
.../apache/jena/graph/compose/UnionTest.java | 2 +-
.../jena/graph/test/AbstractTestGraph.java | 72 +-
.../jena/graph/test/TestCapabilities.java | 6 -
.../jena/graph/test/TestTypedLiterals.java | 5 +-
.../apache/jena/mem/BunchMapContractTest.java | 8 +-
.../jena/mem/TripleBunchContractTest.java | 4 +-
.../java/org/apache/jena/n3/TestResolver.java | 26 +-
.../jena/rdf/model/test/AbstractTestModel.java | 62 +-
.../apache/jena/rdf/model/test/TestModel.java | 46 +-
.../jena/rdf/model/test/TestModelFactory.java | 4 +-
.../rdf/model/test/TestModelPrefixMapping.java | 3 +
.../jena/rdf/model/test/TestModelRead.java | 3 +-
.../jena/rdfxml/xmloutput/PrettyWriterTest.java | 61 -
.../rulesys/impl/TestLPBRuleEngine.java | 37 +
.../reasoner/rulesys/test/TestCapabilities.java | 72 --
.../jena/reasoner/rulesys/test/TestPackage.java | 1 -
.../apache/jena/reasoner/test/TestInfGraph.java | 9 -
.../jena/reasoner/test/TestReasoners.java | 67 +-
.../jena/shared/AbstractTestPrefixMapping.java | 15 +
.../java/org/apache/jena/test/JenaTestBase.java | 4 +
.../apache/jena/test/RDFSJenaInitTestApp.java | 28 +
.../org/apache/jena/test/TestSystemSetup.java | 29 +
.../AbstractGraphProducer.java | 2 +-
.../AbstractModelProducer.java | 2 +-
.../AbstractRecordingListener.java | 2 +-
.../jena/testing_framework/GraphHelper.java | 6 +-
.../jena/testing_framework/ModelHelper.java | 6 +-
.../jena/testing_framework/TestFileData.java | 4 +-
.../jena/testing_framework/TestUtils.java | 10 +-
.../testing_framework/manifest/Manifest.java | 8 +-
.../manifest/ManifestSuite.java | 2 +-
.../jena/testing_framework/tuples/TupleSet.java | 2 +-
.../org/apache/jena/util/junit/Manifest.java | 2 +-
jena-csv/NOTICE | 2 +-
jena-csv/pom.xml | 10 +-
.../propertytable/graph/GraphPropertyTable.java | 2 +-
.../graph/QueryIterPropertyTable.java | 4 +-
.../graph/QueryIterPropertyTableRow.java | 4 +-
.../apache/jena/propertytable/lang/LangCSV.java | 2 +-
jena-csv/src/main/resources/META-INF/NOTICE | 2 +-
.../jena/propertytable/lang/TestLangCSV.java | 3 +-
jena-elephas/NOTICE | 2 +-
jena-elephas/jena-elephas-common/pom.xml | 2 +-
jena-elephas/jena-elephas-io/pom.xml | 2 +-
.../AbstractBlockBasedNodeTupleReader.java | 2 +
.../AbstractWholeFileNodeTupleReader.java | 2 +
.../AbstractNodeTupleOutputFormatTests.java | 2 +-
.../output/trig/TriGBlankNodeOutputTests.java | 2 +-
.../turtle/TurtleBlankNodeOutputTests.java | 2 +-
jena-elephas/jena-elephas-mapreduce/pom.xml | 2 +-
jena-elephas/jena-elephas-stats/pom.xml | 2 +-
jena-elephas/pom.xml | 6 +-
jena-examples/pom.xml | 2 +-
jena-extras/jena-querybuilder/pom.xml | 2 +-
.../arq/querybuilder/AbstractQueryBuilder.java | 204 ++-
.../jena/arq/querybuilder/AskBuilder.java | 28 +-
.../jena/arq/querybuilder/ConstructBuilder.java | 25 +-
.../jena/arq/querybuilder/SelectBuilder.java | 26 +-
.../arq/querybuilder/clauses/ValuesClause.java | 169 +++
.../arq/querybuilder/clauses/WhereClause.java | 32 +-
.../querybuilder/handlers/ConstructHandler.java | 2 +-
.../arq/querybuilder/handlers/HandlerBlock.java | 23 +
.../querybuilder/handlers/PrologHandler.java | 2 +-
.../querybuilder/handlers/SelectHandler.java | 1 +
.../handlers/SolutionModifierHandler.java | 13 +-
.../querybuilder/handlers/ValuesHandler.java | 208 ++++
.../arq/querybuilder/handlers/WhereHandler.java | 38 +-
.../rewriters/AbstractRewriter.java | 6 +-
.../querybuilder/rewriters/ExprRewriter.java | 13 +-
.../arq/querybuilder/rewriters/OpRewriter.java | 6 +-
.../jena/arq/AbstractRegexpBasedTest.java | 13 +-
.../querybuilder/AbstractQueryBuilderTest.java | 1 +
.../clauses/AbstractClauseTest.java | 8 +-
.../querybuilder/clauses/PrologClauseTest.java | 2 +-
.../querybuilder/clauses/ValuesClauseTest.java | 270 ++++
.../querybuilder/clauses/WhereClauseTest.java | 57 +-
.../handlers/AbstractHandlerTest.java | 6 +-
.../handlers/ConstructHandlerTest.java | 2 +-
.../handlers/DatasetHandlerTest.java | 6 +-
.../handlers/PrologHandlerTest.java | 4 +-
.../handlers/SelectHandlerTest.java | 14 +
.../handlers/SolutionModifierHandlerTest.java | 6 +-
.../handlers/ValuesHandlerTest.java | 400 ++++++
.../querybuilder/handlers/WhereHandlerTest.java | 97 +-
jena-extras/pom.xml | 6 +-
jena-fuseki1/NOTICE | 2 +-
jena-fuseki1/assembly-dist.xml | 12 +-
jena-fuseki1/config-tdb-text.ttl | 8 -
jena-fuseki1/dist/NOTICE | 2 +-
jena-fuseki1/dist/README | 48 +
jena-fuseki1/pom.xml | 18 +-
.../jena/fuseki/EmbeddedFusekiServer.java | 85 --
.../jena/fuseki/EmbeddedFusekiServer1.java | 88 ++
.../java/org/apache/jena/fuseki/FusekiCmd.java | 7 +-
.../apache/jena/fuseki/server/CounterSet.java | 2 +-
.../apache/jena/fuseki/server/DatasetRef.java | 4 +-
.../apache/jena/fuseki/server/FusekiConfig.java | 2 +-
.../apache/jena/fuseki/server/SPARQLServer.java | 6 +-
.../apache/jena/fuseki/server/ServiceRef.java | 2 +-
.../apache/jena/fuseki/servlets/HttpAction.java | 2 +-
.../apache/jena/fuseki/servlets/REST_Quads.java | 17 +-
.../jena/fuseki/servlets/ResponseModel.java | 2 +-
.../jena/fuseki/servlets/ResponseResultSet.java | 2 +-
.../jena/fuseki/servlets/SPARQL_REST.java | 17 +-
.../jena/fuseki/servlets/ServletBase.java | 3 +-
.../jena/fuseki/validation/DataValidator.java | 22 +-
.../src/main/resources/META-INF/DEPENDENCIES | 24 -
jena-fuseki1/src/main/resources/META-INF/NOTICE | 2 +-
.../java/org/apache/jena/fuseki/ServerCtl.java | 243 ++++
.../java/org/apache/jena/fuseki/ServerTest.java | 133 --
.../org/apache/jena/fuseki/ServerTestData.java | 45 +
.../java/org/apache/jena/fuseki/TS_Fuseki.java | 29 +-
.../java/org/apache/jena/fuseki/TestAuth.java | 268 ++--
.../java/org/apache/jena/fuseki/TestQuery.java | 103 +-
.../apache/jena/fuseki/TestSPARQLProtocol.java | 63 +-
.../fuseki/http/TestDatasetAccessorHTTP.java | 147 ++-
.../http/TestDatasetGraphAccessorHTTP.java | 18 +-
.../org/apache/jena/fuseki/http/TestHttpOp.java | 32 +-
jena-fuseki2/NOTICE | 2 +-
.../apache-jena-fuseki/assembly-dist.xml | 6 +-
jena-fuseki2/apache-jena-fuseki/dist/NOTICE | 2 +-
jena-fuseki2/apache-jena-fuseki/dist/README | 61 +
jena-fuseki2/apache-jena-fuseki/pom.xml | 4 +-
jena-fuseki2/jena-fuseki-core/pom.xml | 19 +-
.../org/apache/jena/fuseki/async/AsyncPool.java | 2 +-
.../apache/jena/fuseki/build/FusekiBuilder.java | 2 +-
.../apache/jena/fuseki/build/FusekiConfig.java | 20 -
.../jena/fuseki/build/RefCountingMap.java | 4 +-
.../org/apache/jena/fuseki/cmd/FusekiCmd.java | 73 +-
.../apache/jena/fuseki/jetty/JettyFuseki.java | 25 +-
.../apache/jena/fuseki/mgt/ActionAsyncTask.java | 3 -
.../org/apache/jena/fuseki/mgt/ActionCtl.java | 3 -
.../apache/jena/fuseki/mgt/ActionDatasets.java | 20 +-
.../fuseki/migrate/DatasetGraphSwitchable.java | 2 +-
.../fuseki/server/DataAccessPointRegistry.java | 16 +-
.../apache/jena/fuseki/server/DataService.java | 22 +-
.../apache/jena/fuseki/server/FusekiEnv.java | 19 +-
.../apache/jena/fuseki/server/FusekiServer.java | 13 +-
.../fuseki/server/FusekiServerListener.java | 17 +-
.../apache/jena/fuseki/servlets/ActionBase.java | 8 +-
.../jena/fuseki/servlets/ActionSPARQL.java | 16 +-
.../jena/fuseki/servlets/CrossOriginFilter.java | 8 +-
.../jena/fuseki/servlets/ResponseDataset.java | 2 +-
.../jena/fuseki/servlets/SPARQL_Query.java | 2 +-
.../fuseki/servlets/SPARQL_UberServlet.java | 12 +-
.../jena/fuseki/servlets/SPARQL_Update.java | 2 +-
.../jena/fuseki/servlets/SPARQL_Upload.java | 82 +-
.../jena/fuseki/servlets/ServletBase.java | 3 +-
.../jena/fuseki/validation/DataValidator.java | 60 +-
.../fuseki/validation/ValidatorBaseJson.java | 4 -
.../src/main/resources/META-INF/NOTICE | 2 +-
.../src/main/webapp/css/yasqe.min.css | 2 +-
.../src/main/webapp/js/lib/sprintf-0.7-beta1.js | 366 +++---
.../src/main/webapp/js/lib/yasqe.min.js | 16 +-
.../src/main/webapp/js/lib/yasqe.min.js.map | 2 +-
.../apache/jena/fuseki/AbstractFusekiTest.java | 18 +-
.../java/org/apache/jena/fuseki/FileSender.java | 4 +-
.../java/org/apache/jena/fuseki/FusekiTest.java | 13 +-
.../java/org/apache/jena/fuseki/ServerCtl.java | 270 ++++
.../java/org/apache/jena/fuseki/ServerTest.java | 138 ---
.../java/org/apache/jena/fuseki/TS_Fuseki.java | 8 +
.../java/org/apache/jena/fuseki/TestAdmin.java | 82 +-
.../java/org/apache/jena/fuseki/TestAuth.java | 178 ++-
.../org/apache/jena/fuseki/TestDatasetOps.java | 30 +-
.../org/apache/jena/fuseki/TestFileUpload.java | 27 +-
.../apache/jena/fuseki/TestHttpOperations.java | 60 +-
.../org/apache/jena/fuseki/TestHttpOptions.java | 13 +-
.../java/org/apache/jena/fuseki/TestQuery.java | 181 +--
.../apache/jena/fuseki/TestSPARQLProtocol.java | 34 +-
.../apache/jena/fuseki/TestServerReadOnly.java | 32 +-
.../fuseki/http/TestDatasetAccessorHTTP.java | 37 +-
.../http/TestDatasetGraphAccessorHTTP.java | 18 +-
.../org/apache/jena/fuseki/http/TestHttpOp.java | 105 +-
jena-fuseki2/jena-fuseki-embedded/pom.xml | 61 +-
.../fuseki/embedded/FusekiEmbeddedServer.java | 95 +-
.../jena/fuseki/embedded/FusekiTestServer.java | 230 ++++
.../jena/fuseki/embedded/TS_EmbeddedFuseki.java | 3 +-
.../fuseki/embedded/TestEmbeddedFuseki.java | 113 +-
.../fuseki/embedded/TestMultipleEmbedded.java | 170 +++
jena-fuseki2/jena-fuseki-server/pom.xml | 10 +-
jena-fuseki2/jena-fuseki-war/pom.xml | 2 +-
jena-fuseki2/pom.xml | 4 +-
jena-integration-tests/LICENSE | 177 +++
jena-integration-tests/NOTICE | 4 +
jena-integration-tests/README.md | 11 +
jena-integration-tests/pom.xml | 157 +++
.../test/rdfconnection/TS_RDFConnection2.java | 36 +
.../TestRDFConnectionLocalTDB.java | 39 +
.../rdfconnection/TestRDFConnectionRemote.java | 78 ++
.../src/test/resources/log4j.properties | 40 +
.../testing/RDFConnection/data.trig | 16 +
.../testing/RDFConnection/data.ttl | 6 +
jena-iri/NOTICE | 2 +-
jena-iri/pom.xml | 4 +-
.../src/main/java/org/apache/jena/iri/IRI.java | 4 +-
.../java/org/apache/jena/iri/impl/Test.java | 23 -
jena-iri/src/main/resources/META-INF/NOTICE | 2 +-
jena-jdbc/NOTICE | 2 +-
jena-jdbc/jena-jdbc-core/NOTICE | 2 +-
jena-jdbc/jena-jdbc-core/pom.xml | 9 +-
.../java/org/apache/jena/jdbc/JenaDriver.java | 15 +-
.../jdbc/connections/DatasetConnection.java | 4 +-
.../jena/jdbc/connections/JenaConnection.java | 6 +-
.../apache/jena/jdbc/metadata/JenaMetadata.java | 9 +-
.../jdbc/results/MaterializedSelectResults.java | 6 +-
.../jena/jdbc/results/TripleListResults.java | 2 +-
.../metadata/AbstractResultsMetadata.java | 4 +-
.../jena/jdbc/statements/JenaStatement.java | 6 +-
.../apache/jena/jdbc/utils/JdbcNodeUtils.java | 2 +-
.../jena/jdbc/AbstractJenaDriverTests.java | 1 -
.../AbstractJenaConnectionTests.java | 24 +-
.../results/AbstractDatabaseMetadataTests.java | 1 -
.../jdbc/results/AbstractResultSetTests.java | 8 +-
.../org/apache/jena/jdbc/utils/TestUtils.java | 27 +-
jena-jdbc/jena-jdbc-driver-bundle/NOTICE | 2 +-
jena-jdbc/jena-jdbc-driver-bundle/pom.xml | 51 +-
.../resources/META-INF/services/java.sql.Driver | 3 -
jena-jdbc/jena-jdbc-driver-mem/NOTICE | 2 +-
jena-jdbc/jena-jdbc-driver-mem/pom.xml | 9 +-
.../org/apache/jena/jdbc/mem/MemDriver.java | 1 -
.../metadata/TestDatasetConnectionMetadata.java | 2 +-
jena-jdbc/jena-jdbc-driver-remote/NOTICE | 2 +-
jena-jdbc/jena-jdbc-driver-remote/pom.xml | 13 +-
.../jena/jdbc/remote/RemoteEndpointDriver.java | 169 +--
.../connections/RemoteEndpointConnection.java | 27 +-
.../remote/metadata/RemoteEndpointMetadata.java | 1 -
.../RemoteEndpointPreparedStatement.java | 24 +-
.../statements/RemoteEndpointStatement.java | 23 +-
.../jena/jdbc/remote/TS_JdbcDriverRemote.java | 20 +-
.../jdbc/remote/TestRemoteEndpointDriver.java | 21 +-
.../AbstractRemoteEndpointConnectionTests.java | 8 -
.../TestRemoteEndpointConnection.java | 37 +-
.../TestRemoteEndpointConnectionWithAuth.java | 44 +-
...stRemoteEndpointConnectionWithGraphUris.java | 47 +-
...oteEndpointConnectionWithResultSetTypes.java | 37 +-
.../metadata/TestRemoteConnectionMetadata.java | 39 +-
.../AbstractRemoteEndpointResultSetTests.java | 5 +-
.../results/TestRemoteEndpointResults.java | 24 +-
.../TestRemoteEndpointResultsWithAuth.java | 39 +-
.../TestRemoteEndpointResultsWithGraphUris.java | 33 +-
...RemoteEndpointResultsWithResultSetTypes.java | 30 +-
.../TestRemoteEndpointStatements.java | 39 +-
jena-jdbc/jena-jdbc-driver-tdb/NOTICE | 2 +-
jena-jdbc/jena-jdbc-driver-tdb/pom.xml | 14 +-
.../tdb/metadata/TestTdbConnectionMetadata.java | 2 +-
jena-jdbc/license-header.txt | 15 -
jena-jdbc/pom.xml | 74 +-
jena-maven-tools/pom.xml | 4 +-
jena-parent/NOTICE | 2 +-
jena-parent/pom.xml | 58 +-
jena-permissions/NOTICE | 2 +-
jena-permissions/pom.xml | 36 +-
.../org/apache/jena/permissions/Factory.java | 3 +-
.../jena/permissions/SecurityEvaluator.java | 2 +-
.../permissions/SecurityEvaluatorAssembler.java | 2 +-
.../permissions/graph/SecuredCapabilities.java | 13 +-
.../graph/SecuredGraphEventManager.java | 12 +-
.../jena/permissions/graph/impl/Factory.java | 6 +-
.../graph/impl/SecuredPrefixMappingImpl.java | 12 +
.../jena/permissions/impl/ItemHolder.java | 2 +-
.../jena/permissions/impl/SecuredItemImpl.java | 14 +-
.../jena/permissions/model/SecuredModel.java | 555 ++++-----
.../jena/permissions/model/SecuredResource.java | 98 +-
.../permissions/model/impl/SecuredAltImpl.java | 2 +-
.../permissions/model/impl/SecuredBagImpl.java | 2 +-
.../model/impl/SecuredContainerImpl.java | 10 +-
.../model/impl/SecuredLiteralImpl.java | 2 +-
.../model/impl/SecuredModelImpl.java | 1170 +++++++-----------
.../model/impl/SecuredNodeIterator.java | 2 +-
.../model/impl/SecuredPropertyImpl.java | 2 +-
.../model/impl/SecuredRDFListImpl.java | 16 +-
.../model/impl/SecuredRDFNodeImpl.java | 41 +-
.../model/impl/SecuredReifiedStatementImpl.java | 2 +-
.../model/impl/SecuredResourceImpl.java | 227 ++--
.../permissions/model/impl/SecuredSeqImpl.java | 2 +-
.../model/impl/SecuredStatementImpl.java | 2 +-
.../permissions/query/rewriter/OpRewriter.java | 7 +-
.../jena/permissions/MockPrefixMapping.java | 5 +
.../SecurityEvaluatorParameters.java | 4 +-
.../contract/model/ModelTestSuite.java | 2 +-
.../contract/model/SecTestPackage.java | 2 +-
.../jena/permissions/model/SecuredAltTest.java | 177 +--
.../permissions/model/SecuredContainerTest.java | 132 +-
.../model/SecuredModelDetailTest.java | 13 +-
.../permissions/model/SecuredModelTest.java | 665 +++++-----
.../permissions/model/SecuredPropertyTest.java | 12 +-
.../permissions/model/SecuredRDFListTest.java | 268 ++--
.../permissions/model/SecuredRDFNodeTest.java | 68 +-
.../model/SecuredReifiedStatementTest.java | 25 +-
.../permissions/model/SecuredResourceTest.java | 483 +++++---
.../jena/permissions/query/DataSetTest.java | 79 +-
.../jena/permissions/query/QueryEngineTest.java | 22 +-
.../src/test/resources/log4j.properties | 7 +-
jena-rdfconnection/LICENSE | 177 +++
jena-rdfconnection/NOTICE | 5 +
jena-rdfconnection/pom.xml | 171 +++
.../apache/jena/rdfconnection/Isolation.java | 23 +
.../rdfconnection/JenaConnectionException.java | 29 +
.../org/apache/jena/rdfconnection/RDFConn.java | 40 +
.../jena/rdfconnection/RDFConnection.java | 367 ++++++
.../rdfconnection/RDFConnectionFactory.java | 112 ++
.../jena/rdfconnection/RDFConnectionLocal.java | 312 +++++
.../rdfconnection/RDFConnectionModular.java | 195 +++
.../jena/rdfconnection/RDFConnectionRemote.java | 471 +++++++
.../RDFDatasetAccessConnection.java | 57 +
.../rdfconnection/RDFDatasetConnection.java | 150 +++
.../rdfconnection/SparqlQueryConnection.java | 105 ++
.../rdfconnection/SparqlUpdateConnection.java | 53 +
.../examples/RDFConnectionExample1.java | 45 +
.../examples/RDFConnectionExample2.java | 67 +
.../examples/RDFConnectionExample3.java | 42 +
jena-rdfconnection/src/main/resources/LICENSE | 177 +++
jena-rdfconnection/src/main/resources/NOTICE | 5 +
.../AbstractTestRDFConnection.java | 381 ++++++
.../jena/rdfconnection/TS_RDFConnection.java | 33 +
.../jena/rdfconnection/TestLocalIsolation.java | 84 ++
.../TestRDFConnectionLocalMRSW.java | 38 +
.../TestRDFConnectionLocalTxnMem.java | 38 +
.../src/test/resources/log4j.properties | 40 +
.../testing/RDFConnection/data.trig | 16 +
.../testing/RDFConnection/data.ttl | 6 +
jena-sdb/NOTICE | 2 +-
jena-sdb/dist/NOTICE | 2 +-
jena-sdb/pom.xml | 14 +-
.../apache/jena/sdb/exprmatch/ExprMatcher.java | 5 +
.../jena/sdb/graph/TransactionHandlerSDB.java | 26 +-
.../org/apache/jena/sdb/sql/SDBConnection.java | 14 +-
jena-sdb/src/main/resources/META-INF/NOTICE | 2 +-
.../jena/sdb/test/junit/QueryTestSDB.java | 22 +-
jena-shaded-guava/pom.xml | 4 +-
jena-spatial/NOTICE | 2 +-
jena-spatial/pom.xml | 47 +-
.../main/java/examples/JenaSpatialExample1.java | 530 ++++----
.../src/main/java/jena/spatialindexdump.java | 6 +-
.../jena/query/spatial/DistanceUnitsUtils.java | 4 +-
.../jena/query/spatial/EntityDefinition.java | 12 +-
.../query/spatial/SpatialDatasetFactory.java | 24 -
.../apache/jena/query/spatial/SpatialIndex.java | 2 +-
.../jena/query/spatial/SpatialIndexContext.java | 6 +-
.../jena/query/spatial/SpatialIndexLucene.java | 30 +-
.../jena/query/spatial/SpatialIndexSolr.java | 177 ---
.../apache/jena/query/spatial/SpatialQuery.java | 4 +-
.../jena/query/spatial/SpatialQueryFuncs.java | 6 +-
.../assembler/EntityDefinitionAssembler.java | 2 +-
.../spatial/assembler/SpatialAssembler.java | 1 -
.../assembler/SpatialIndexLuceneAssembler.java | 3 +-
.../assembler/SpatialIndexSolrAssembler.java | 81 --
.../query/spatial/assembler/SpatialVocab.java | 3 -
.../query/spatial/pfunction/SpatialMatch.java | 2 +-
.../pfunction/SpatialOperationPFBase.java | 4 +-
jena-spatial/src/main/resources/META-INF/NOTICE | 2 +-
.../AbstractTestDatasetWithSpatialIndex.java | 12 +-
.../AbstractTestIndexingSpatialData.java | 6 +-
.../jena/query/spatial/SpatialSearchUtil.java | 31 +-
.../apache/jena/query/spatial/TS_Spatial.java | 11 -
.../TestIndexingSpatialDataWithSolr.java | 40 -
.../TestTDBDatasetWithLuceneSpatialIndex.java | 4 +-
.../assembler/AbstractTestSpatialAssembler.java | 9 +-
.../TestEntityDefinitionAssembler.java | 6 +-
.../TestSpatialIndexSolrAssembler.java | 38 -
.../spatial/pfunction/AbstractTestEastPF.java | 12 +-
.../pfunction/AbstractTestIntersectsBoxPF.java | 12 +-
.../pfunction/AbstractTestIsNearByPF.java | 42 +-
.../pfunction/AbstractTestIsWithinBoxPF.java | 12 +-
.../pfunction/AbstractTestIsWithinCirclePF.java | 42 +-
.../spatial/pfunction/AbstractTestNorthPF.java | 12 +-
.../spatial/pfunction/AbstractTestSouthPF.java | 12 +-
.../spatial/pfunction/AbstractTestWestPF.java | 12 +-
.../TestEastPFWithEmbeddedSolrSpatialIndex.java | 47 -
...rsectsBoxPFWithEmbeddedSolrSpatialIndex.java | 44 -
...tIsNearByPFWithEmbeddedSolrSpatialIndex.java | 41 -
...WithinBoxPFWithEmbeddedSolrSpatialIndex.java | 47 -
...hinCirclePFWithEmbeddedSolrSpatialIndex.java | 41 -
...TestNorthPFWithEmbeddedSolrSpatialIndex.java | 47 -
...TestSouthPFWithEmbeddedSolrSpatialIndex.java | 47 -
.../TestWestPFWithEmbeddedSolrSpatialIndex.java | 47 -
.../SolrHome/SolrARQCollection/conf/schema.xml | 56 -
.../SolrARQCollection/conf/solrconfig.xml | 77 --
.../src/test/resources/SolrHome/solr.xml | 8 -
.../src/test/resources/log4j.properties | 7 +-
.../resources/spatial-config-spatialindexer.ttl | 2 -
.../src/test/resources/spatial-config.ttl | 2 -
.../src/test/resources/spatial-solr-config.ttl | 51 -
jena-tdb/NOTICE | 2 +-
jena-tdb/bin-test/bptree | 10 -
jena-tdb/bin-test/driver | 90 --
jena-tdb/bin-test/exthash | 10 -
jena-tdb/bin-test/repack | 11 -
jena-tdb/pom.xml | 12 +-
.../org/apache/jena/tdb/base/file/Location.java | 2 +-
.../tdb/base/objectfile/ObjectFileStorage.java | 4 +-
.../org/apache/jena/tdb/base/page/PageBase.java | 2 +-
.../base/recordbuffer/RecordRangeIterator.java | 4 +-
.../tdb/index/bplustree/BPlusTreeParams.java | 2 +-
.../java/org/apache/jena/tdb/lib/NodeLib.java | 2 +-
.../jena/tdb/setup/DatasetBuilderStd.java | 7 +-
.../org/apache/jena/tdb/setup/StoreParams.java | 3 +-
.../org/apache/jena/tdb/solver/BindingTDB.java | 4 +-
.../apache/jena/tdb/solver/StageMatchTuple.java | 11 +-
.../jena/tdb/store/DatasetPrefixesTDB.java | 6 +-
.../org/apache/jena/tdb/store/DateTimeNode.java | 5 -
.../org/apache/jena/tdb/store/GraphTDB.java | 12 -
.../java/org/apache/jena/tdb/store/NodeId.java | 148 +--
.../store/bulkloader/LoaderNodeTupleTable.java | 5 +-
.../tdb/store/nodetable/NodeTableReadonly.java | 6 +-
.../tdb/store/nodetable/NodeTableWrapper.java | 44 +-
.../jena/tdb/store/nodetable/NodecLib.java | 2 +-
.../nodetupletable/NodeTupleTableConcrete.java | 6 +-
.../apache/jena/tdb/sys/DatasetControlMRSW.java | 148 +--
.../java/org/apache/jena/tdb/sys/FileRef.java | 2 +-
.../java/org/apache/jena/tdb/sys/SystemTDB.java | 2 +-
.../jena/tdb/transaction/BlockMgrJournal.java | 6 +-
.../jena/tdb/transaction/JournalEntryType.java | 2 +-
.../tdb/transaction/TransactionManager.java | 60 +-
jena-tdb/src/main/resources/META-INF/NOTICE | 2 +-
.../apache/jena/tdb/solver/TestSolverTDB.java | 3 +-
.../org/apache/jena/tdb/store/TestNodeId.java | 7 +-
.../java/org/apache/jena/tdb/sys/TS_Sys.java | 3 +
.../jena/tdb/transaction/TS_TransactionTDB.java | 3 +-
.../jena/tdb/transaction/TestTransControl.java | 20 +-
.../tdb/transaction/TestTransIsolation.java | 32 +
.../jena/tdb/transaction/TestTransPromote.java | 394 ------
.../tdb/transaction/TestTransPromoteTDB.java | 72 ++
jena-text/NOTICE | 2 +-
jena-text/pom.xml | 44 +-
jena-text/src/main/java/jena/textindexdump.java | 6 +-
.../jena/query/text/DatasetGraphText.java | 130 +-
.../jena/query/text/TextDatasetFactory.java | 29 +-
.../apache/jena/query/text/TextIndexLucene.java | 59 +-
.../query/text/TextIndexLuceneMultilingual.java | 75 --
.../apache/jena/query/text/TextIndexSolr.java | 254 ----
.../apache/jena/query/text/TextQueryFuncs.java | 6 +-
.../org/apache/jena/query/text/TextQueryPF.java | 2 +-
.../text/analyzer/ConfigurableAnalyzer.java | 33 +-
.../text/analyzer/LowerCaseKeywordAnalyzer.java | 14 +-
.../text/analyzer/MultilingualAnalyzer.java | 54 +
.../apache/jena/query/text/analyzer/Util.java | 10 +-
.../ConfigurableAnalyzerAssembler.java | 3 +-
.../assembler/LocalizedAnalyzerAssembler.java | 5 +-
.../LowerCaseKeywordAnalyzerAssembler.java | 3 +-
.../text/assembler/SimpleAnalyzerAssembler.java | 3 +-
.../assembler/StandardAnalyzerAssembler.java | 9 +-
.../query/text/assembler/TextAssembler.java | 1 -
.../text/assembler/TextDatasetAssembler.java | 5 +-
.../assembler/TextIndexLuceneAssembler.java | 5 +-
.../text/assembler/TextIndexSolrAssembler.java | 68 -
.../jena/query/text/assembler/TextVocab.java | 2 -
jena-text/src/main/resources/META-INF/NOTICE | 2 +-
.../org/apache/jena/query/text/TS_Text.java | 6 -
.../jena/query/text/TestBuildTextDataset.java | 2 +-
.../TestDatasetWithEmbeddedSolrTextIndex.java | 54 -
...tasetWithLuceneTextIndexDeletionSupport.java | 4 +-
.../text/TestLuceneWithMultipleThreads.java | 5 +-
.../apache/jena/query/text/TextSearchUtil.java | 8 +-
.../text/assembler/TestEntityMapAssembler.java | 2 +-
.../assembler/TestTextIndexSolrAssembler.java | 69 --
jena-text/src/test/resources/log4j.properties | 5 -
.../testing/TextQuery/text-config-union.ttl | 2 -
jena-text/testing/TextQuery/text-config.ttl | 2 -
.../testing/TextQuery/text-solr-config.ttl | 45 -
jena-text/text-config.ttl | 2 -
pom.xml | 61 +-
914 files changed, 23769 insertions(+), 16501 deletions(-)
----------------------------------------------------------------------
[08/15] jena git commit: JENA-1324: Special handling for spaces in
URIs
Posted by an...@apache.org.
JENA-1324: Special handling for spaces in URIs
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/4e481553
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/4e481553
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/4e481553
Branch: refs/heads/master
Commit: 4e481553e5c80b851400f05c8baa96773f4384b4
Parents: 6165a44
Author: Andy Seaborne <an...@apache.org>
Authored: Sat Apr 22 22:04:44 2017 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Sat Apr 22 23:12:14 2017 +0100
----------------------------------------------------------------------
.../apache/jena/riot/lang/ReaderRIOTRDFXML.java | 52 +++++++++++++-------
1 file changed, 34 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/4e481553/jena-arq/src/main/java/org/apache/jena/riot/lang/ReaderRIOTRDFXML.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/lang/ReaderRIOTRDFXML.java b/jena-arq/src/main/java/org/apache/jena/riot/lang/ReaderRIOTRDFXML.java
index 597ad7b..ed37f2a 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/lang/ReaderRIOTRDFXML.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/lang/ReaderRIOTRDFXML.java
@@ -34,10 +34,7 @@ import org.apache.jena.iri.IRIFactory;
import org.apache.jena.rdf.model.RDFErrorHandler ;
import org.apache.jena.rdfxml.xmlinput.* ;
import org.apache.jena.rdfxml.xmlinput.impl.ARPSaxErrorHandler ;
-import org.apache.jena.riot.Lang;
-import org.apache.jena.riot.ReaderRIOT;
-import org.apache.jena.riot.ReaderRIOTFactory;
-import org.apache.jena.riot.SysRIOT;
+import org.apache.jena.riot.*;
import org.apache.jena.riot.checker.CheckerLiterals ;
import org.apache.jena.riot.system.*;
import org.apache.jena.sparql.util.Context;
@@ -60,17 +57,7 @@ public class ReaderRIOTRDFXML implements ReaderRIOT
}
}
- // RDF 1.1 is based on URIs/IRIs, where space are not allowed.
- // RDF 1.0 (and RDF/XML) was based on "RDF URI References" which did allow spaces.
- static {
- if ( JenaRuntime.isRDF11 ) {
- ARPOptions.setIRIFactoryGlobal(IRIFactory.iriImplementation());
- }
- }
-
private ARP arp = new ARP() ;
- // arp.getOptions.setIRIFactory does not work if called this early : it gets overwritten in JenaReader.
- // Using ARPOptions.setIRIFactoryGlobal does work.
private InputStream input = null ;
private Reader reader = null ;
@@ -100,18 +87,30 @@ public class ReaderRIOTRDFXML implements ReaderRIOT
this.sink = output ;
parse();
}
+
+ // RDF 1.1 is based on URIs/IRIs, where space are not allowed.
+ // RDF 1.0 (and RDF/XML) was based on "RDF URI References" which did allow spaces.
+ // Use with TDB erquires this to be "true" - it is set by InitTDB.
public static boolean RiotUniformCompatibility = false ;
// Warnings in ARP that should be errors to be compatible with
// non-XML-based languages. e.g. language tags should be
// syntactically valid.
private static int[] additionalErrors = new int[] {
ARPErrorNumbers.WARN_MALFORMED_XMLLANG
+ //, ARPErrorNumbers.WARN_MALFORMED_URI
//, ARPErrorNumbers.WARN_STRING_NOT_NORMAL_FORM_C
} ;
+
+ // Special case of space in URI is handled in HandlerSink (below).
+ // This is instead of ARPErrorNumbers.WARN_MALFORMED_URI in additionalErrors[].
+ // which causes a WARN (from ARP, with line+column numbers) then a ERROR from RIOT.
+ // It's a pragmatic compromise.
+ private static boolean errorForSpaceInURI = true;
public void parse() {
// Hacked out of ARP because of all the "private" methods
+ // JenaReader has reset the options since new ARP() was called.
sink.start() ;
HandlerSink rslt = new HandlerSink(sink, errorHandler) ;
arp.getHandlers().setStatementHandler(rslt) ;
@@ -122,9 +121,12 @@ public class ReaderRIOTRDFXML implements ReaderRIOT
ARPOptions options = arp.getOptions() ;
// Convert some warnings to errors for compatible behaviour for all parsers.
for ( int code : additionalErrors )
- options.setErrorMode(code, ARPErrorNumbers.EM_FATAL) ;
+ options.setErrorMode(code, ARPErrorNumbers.EM_ERROR) ;
arp.setOptionsWith(options) ;
}
+
+ if ( JenaRuntime.isRDF11 )
+ arp.getOptions().setIRIFactory(IRIFactory.iriImplementation());
try {
if ( reader != null )
@@ -188,9 +190,23 @@ public class ReaderRIOTRDFXML implements ReaderRIOT
}
private Node convert(AResource r) {
- if (!r.isAnonymous())
- return NodeFactory.createURI(r.getURI());
-
+ if (!r.isAnonymous()) {
+ // URI.
+ String uriStr = r.getURI() ;
+ if ( errorForSpaceInURI ) {
+ // Special check for spaces in a URI.
+ // Convert to an error like TokernizerText.
+ if ( uriStr.contains(" ") ) {
+ int i = uriStr.indexOf(' ');
+ String s = uriStr.substring(0,i);
+ String msg = String.format("Bad character in IRI (space): <%s[space]...>", s);
+ riotErrorHandler.error(msg, -1, -1);
+ throw new RiotParseException(msg, -1, -1);
+ }
+ }
+ return NodeFactory.createURI(uriStr);
+ }
+
// String id = r.getAnonymousID();
Node rr = (Node) r.getUserData();
if (rr == null) {
[09/15] jena git commit: Ensure paremt iterator close()d when
QueryCancelException caught. Replace tab by spaces.
Posted by an...@apache.org.
Ensure paremt iterator close()d when QueryCancelException caught.
Replace tab by spaces.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/f553715c
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/f553715c
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/f553715c
Branch: refs/heads/master
Commit: f553715c3b21d37ddcc1339c70b83a77630b1d12
Parents: 2fe3c28
Author: Chris Dollin <eh...@googlemail.com>
Authored: Mon Apr 24 10:49:57 2017 +0100
Committer: Chris Dollin <eh...@googlemail.com>
Committed: Mon Apr 24 10:49:57 2017 +0100
----------------------------------------------------------------------
.../java/org/apache/jena/sparql/engine/iterator/QueryIterSort.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/f553715c/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterSort.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterSort.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterSort.java
index 4485111..fc26a8d 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterSort.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterSort.java
@@ -92,7 +92,7 @@ public class QueryIterSort extends QueryIterPlainWrapper {
// iterator in a try/finally block, and thus will call
// close() themselves.
catch (QueryCancelledException e) {
- QueryIterSort.this.close();
+ QueryIterSort.this.close();
close();
throw e;
}
[15/15] jena git commit: JENA-1321: This closes #240. See PR-241
Posted by an...@apache.org.
JENA-1321: This closes #240. See PR-241
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/e05692f5
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/e05692f5
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/e05692f5
Branch: refs/heads/master
Commit: e05692f5ce83dbeb4cb30c537c887b874818775e
Parents: 0cbea57
Author: Andy Seaborne <an...@apache.org>
Authored: Tue Apr 25 18:34:47 2017 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Tue Apr 25 18:34:47 2017 +0100
----------------------------------------------------------------------
----------------------------------------------------------------------
[04/15] jena git commit: JENA-1323: RDFWriter
Posted by an...@apache.org.
JENA-1323: RDFWriter
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/ef278645
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/ef278645
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/ef278645
Branch: refs/heads/master
Commit: ef278645dc3e7883f0d5e4f533890b5365dcf4b1
Parents: b386e4a
Author: Andy Seaborne <an...@apache.org>
Authored: Tue Apr 18 17:19:25 2017 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Tue Apr 18 22:07:10 2017 +0100
----------------------------------------------------------------------
.../java/org/apache/jena/riot/RDFDataMgr.java | 14 +-
.../java/org/apache/jena/riot/RDFWriter.java | 220 +++++++++++++++++++
.../org/apache/jena/riot/RDFWriterBuilder.java | 165 ++++++++++++++
.../org/apache/jena/riot/TS_RiotGeneral.java | 5 +-
.../org/apache/jena/riot/TestRDFWriter.java | 88 ++++++++
5 files changed, 482 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/ef278645/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 f884b10..87f5003 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
@@ -1218,23 +1218,21 @@ public class RDFDataMgr
}
private static void write$(OutputStream out, Graph graph, RDFFormat serialization) {
- WriterGraphRIOT w = createGraphWriter$(serialization);
- w.write(out, graph, RiotLib.prefixMap(graph), null, RIOT.getContext());
+ RDFWriter.create().format(serialization).source(graph).output(out);
}
+ @SuppressWarnings("deprecation")
private static void write$(Writer out, Graph graph, RDFFormat serialization) {
- WriterGraphRIOT w = createGraphWriter$(serialization);
- w.write(out, graph, RiotLib.prefixMap(graph), null, RIOT.getContext());
+ RDFWriter.create().format(serialization).source(graph).build().output(out);
}
private static void write$(OutputStream out, DatasetGraph dataset, RDFFormat serialization) {
- WriterDatasetRIOT w = createDatasetWriter$(serialization);
- w.write(out, dataset, RiotLib.prefixMap(dataset), null, RIOT.getContext());
+ RDFWriter.create().format(serialization).source(dataset).output(out);
}
+ @SuppressWarnings("deprecation")
private static void write$(Writer out, DatasetGraph dataset, RDFFormat serialization) {
- WriterDatasetRIOT w = createDatasetWriter$(serialization);
- w.write(out, dataset, RiotLib.prefixMap(dataset), null, RIOT.getContext());
+ RDFWriter.create().format(serialization).source(dataset).build().output(out);
}
/**
http://git-wip-us.apache.org/repos/asf/jena/blob/ef278645/jena-arq/src/main/java/org/apache/jena/riot/RDFWriter.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/RDFWriter.java b/jena-arq/src/main/java/org/apache/jena/riot/RDFWriter.java
new file mode 100644
index 0000000..f20f8c2
--- /dev/null
+++ b/jena-arq/src/main/java/org/apache/jena/riot/RDFWriter.java
@@ -0,0 +1,220 @@
+/*
+ * 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.riot;
+
+import java.io.*;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Objects;
+
+import org.apache.jena.atlas.io.IO;
+import org.apache.jena.atlas.web.ContentType;
+import org.apache.jena.graph.Graph;
+import org.apache.jena.riot.system.RiotLib;
+import org.apache.jena.sparql.core.DatasetGraph;
+import org.apache.jena.sparql.util.Context;
+
+/**
+ * An {@link RDFWriter} is a process that will output triples or quads in an RDF syntax.
+ * {@link RDFWriterBuilder} provides the means to setup the writer.
+ * <p>
+ * The process is
+ *
+ * <pre>
+ * DatasetGraph dsg = ...
+ * RDFWriter writer = RDFWriter.create().source(dsg).lang(Lang.TTL).build();
+ * OutputStream out =
+ * writer.output(out);
+ * </pre>
+ * or using abbreviated forms:
+ * <pre>
+ * RDFWriter.create().source(dsg).lang(Lang.TTL).output(out);
+ * </pre>
+ * @see WriterDatasetRIOT
+ * @see WriterGraphRIOT
+ */
+
+public class RDFWriter {
+ private static int BUF_SIZE = 128*1024;
+ private final DatasetGraph dataset;
+ private final Graph graph;
+ private final RDFFormat format;
+ private final String baseURI;
+ private final Context context;
+
+ /** Create an {@link RDFWriterBuilder}.
+ * <p>
+ * Often used in a pattern such as:
+ * <pre>
+ * RDFWriter.create()
+ * .lang(Lang.TTL)
+ * .source(graph)
+ * .output(System.out);
+ * </pre>
+ */
+ public static RDFWriterBuilder create() { return new RDFWriterBuilder(); }
+
+ /*package*/ RDFWriter(DatasetGraph dataset, Graph graph, RDFFormat format, Lang lang, String baseURI, Context context) {
+ this.dataset = dataset;
+ this.graph = graph;
+ // format may still be null - output to a file later.
+ this.format = chooseFormat(format, lang);
+ this.baseURI = baseURI;
+ this.context = context;
+ }
+
+ private static RDFFormat chooseFormat(RDFFormat format, Lang lang) {
+ if ( format != null )
+ return format;
+ if ( lang == null )
+ //throw new RiotException("No syntax for output") ;
+ return null;
+ format = RDFWriterRegistry.defaultSerialization(lang);
+ return format;
+ }
+
+ /** Write and return as a string.
+ * <p>
+ * The {@code Lang} or {@code RDFFormat} must have been set.
+ */
+ public String asString() {
+ if ( format == null )
+ throw new RiotException("Output as a string needs the Lang/Format specificied");
+ try ( StringWriter sw = new StringWriter() ) {
+ output(sw, format);
+ return sw.toString();
+ } catch (IOException ex) { IO.exception(ex); return null; }
+ }
+
+ /** Write the source to the {@code OutputStream}.
+ * <p>
+ * The {@code Lang} or {@code RDFFormat} must have been set.
+ * @param output
+ */
+ public void output(OutputStream output) {
+ output(output, format);
+ }
+
+ /** Write the source to the Java {@code Writer}.
+ * <p>
+ * The {@code Lang} or {@code RDFFormat} must have been set.
+ * @param javaWriter
+ * @deprecated Using Java Writers risk corrupting the character set. Only UTF-8 is safe.
+ */
+ @Deprecated
+ public void output(Writer javaWriter) {
+ output(javaWriter, format);
+ }
+
+
+ /** Write the source to the file.
+ * <p>
+ * If neither {@code Lang} nor {@code RDFFormat} are set, an attempt to
+ * guess an RDF Syntax is made from the file extension.
+ * <p>Output to "-" goes to stdout.
+ * @param filename
+ */
+ public void output(String filename) {
+ Objects.requireNonNull(filename, "Null filename");
+ RDFFormat fmt = format;
+ if ( fmt == null ) {
+ ContentType ct = RDFLanguages.guessContentType(filename);
+ if ( ct == null )
+ throw new RiotException("Lang and RDFformat unset and can't determine syntax from '"+filename+"'");
+ Lang lang = RDFLanguages.contentTypeToLang(ct);
+ if ( ct == null )
+ throw new RiotException("No syntax registered for '"+ct.getContentType()+"'");
+ fmt = RDFWriterRegistry.defaultSerialization(lang);
+ }
+ if ( filename.equals("-") ) {
+ output(System.out, fmt);
+ return;
+ }
+ Path p = Paths.get(filename);
+ try ( OutputStream out1 = Files.newOutputStream(p);
+ OutputStream out = new BufferedOutputStream(out1, BUF_SIZE)){
+ output(out, fmt);
+ } catch (IOException ex) { IO.exception(ex); }
+ }
+
+ private void output(OutputStream output, RDFFormat format) {
+ if ( format == null )
+ throw new RiotException("No syntax (Lang or RDFFormat) for output") ;
+ if ( graph != null ) {
+ write$(output, graph, format);
+ return;
+ }
+ if ( dataset != null ) {
+ write$(output, dataset, format);
+ return;
+ }
+ throw new RiotException("No graph or dataset to write") ;
+ }
+
+ private void output(Writer javaWriter, RDFFormat format) {
+ if ( format == null )
+ throw new RiotException("No syntax (Lang or RDFFormat) for output") ;
+ if ( graph != null ) {
+ write$(javaWriter, graph, format);
+ return;
+ }
+ if ( dataset != null ) {
+ write$(javaWriter, dataset, format);
+ return;
+ }
+ throw new RiotException("No graph or dataset to write") ;
+ }
+
+ // Allowing an externally set PrefixMap was (probably) a mistake.
+
+ private static WriterGraphRIOT createGraphWriter$(RDFFormat serialization) {
+ WriterGraphRIOTFactory wf = RDFWriterRegistry.getWriterGraphFactory(serialization);
+ if ( wf == null )
+ throw new RiotException("No graph writer for " + serialization);
+ return wf.create(serialization);
+ }
+
+ private static WriterDatasetRIOT createDatasetWriter$(RDFFormat serialization) {
+ WriterDatasetRIOTFactory wf = RDFWriterRegistry.getWriterDatasetFactory(serialization);
+ if ( wf == null )
+ throw new RiotException("No dataset writer for " + serialization);
+ return wf.create(serialization);
+ }
+
+ private void write$(OutputStream out, Graph graph, RDFFormat serialization) {
+ WriterGraphRIOT w = createGraphWriter$(serialization);
+ w.write(out, graph, RiotLib.prefixMap(graph), null, context);
+ }
+
+ private void write$(OutputStream out, DatasetGraph dataset, RDFFormat serialization) {
+ WriterDatasetRIOT w = createDatasetWriter$(serialization);
+ w.write(out, dataset, RiotLib.prefixMap(dataset), null, context);
+ }
+
+ private void write$(Writer out, Graph graph, RDFFormat serialization) {
+ WriterGraphRIOT w = createGraphWriter$(serialization);
+ w.write(out, graph, RiotLib.prefixMap(graph), null,context);
+ }
+
+ private void write$(Writer out, DatasetGraph dataset, RDFFormat serialization) {
+ WriterDatasetRIOT w = createDatasetWriter$(serialization);
+ w.write(out, dataset, RiotLib.prefixMap(dataset), null, context);
+ }
+}
http://git-wip-us.apache.org/repos/asf/jena/blob/ef278645/jena-arq/src/main/java/org/apache/jena/riot/RDFWriterBuilder.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/RDFWriterBuilder.java b/jena-arq/src/main/java/org/apache/jena/riot/RDFWriterBuilder.java
new file mode 100644
index 0000000..1840fcf
--- /dev/null
+++ b/jena-arq/src/main/java/org/apache/jena/riot/RDFWriterBuilder.java
@@ -0,0 +1,165 @@
+/*
+ * 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.riot;
+
+import java.io.OutputStream;
+
+import org.apache.jena.graph.Graph ;
+import org.apache.jena.sparql.core.DatasetGraph ;
+import org.apache.jena.sparql.util.Context;
+
+public class RDFWriterBuilder {
+ private DatasetGraph dataset = null;
+ private Graph graph = null;
+ private Context context = null;
+ private Lang lang = null;
+ private RDFFormat format = null;
+ private String baseURI = null;
+
+ /** A new {@code RDFWriterBuilder}.
+ * <p>
+ * See also {@link RDFWriter#create()}
+ */
+ RDFWriterBuilder () {}
+
+ /** Set the source of wriing to the graph argument.
+ * <p>
+ * Any prrvious source setting is cleared.
+ * @param graph A {@link Graph}.
+ * @return this
+ */
+ public RDFWriterBuilder source(Graph graph) {
+ this.dataset = null;
+ this.graph = graph;
+ return this;
+ }
+
+ /** Set the source of wriing to the {@code DatasetGraph} argument.
+ * <p>
+ * Any prrvious source setting is cleared.
+ * @param dataset A {@link DatasetGraph}.
+ * @return this
+ */
+ public RDFWriterBuilder source(DatasetGraph dataset) {
+ this.graph = null;
+ this.dataset = dataset;
+ return this;
+ }
+
+// // Not implemented
+// public RDFWriterBuilder labels(NodeToLabel nodeToLabel) { return this; }
+//
+// // Not implemented
+// public RDFWriterBuilder formatter(NodeFormatter nodeFormatter) { return this; }
+
+ /** Set the context for the writer when built.
+ *
+ * @param context
+ * @return this
+ */
+ public RDFWriterBuilder context(Context context) {
+ if ( context != null )
+ context = context.copy();
+ this.context = context;
+ return this;
+ }
+
+ /**
+ * Set the output language to a {@link Lang}; this will set the format.
+ * <p>
+ * If {@code Lang} and {@code RDFFormat} are not set, an attempt is made to guess it from file name or URI on output.
+ * <p>
+ * If output is to an {@code OutputStream}, {@code Lang} or {@code RDFFormat} must be set.
+ * <p>
+ * Any previous setting of {@code Lang} or {@code RDFFormat} is cleared.
+ *
+ * @param lang
+ * @return this
+ */
+ public RDFWriterBuilder lang(Lang lang) {
+ this.format = null;
+ this.lang = lang;
+ return this;
+ }
+
+ /**
+ * Set the output format to a {@link RDFFormat}.
+ * <p>
+ * If {@code Lang} and {@code RDFFormat} are not set, an attempt is made to guess it from file name or URI on output.
+ * <p>
+ * If output is to an {@code OutputStream}, {@code Lang} or {@code RDFFormat} must be set.
+ * <p>
+ * Any previous setting of {@code Lang} or {@code RDFFormat} is cleared.
+ * @param format
+ * @return this
+ */
+ public RDFWriterBuilder format(RDFFormat format) {
+ this.lang = null;
+ this.format = format;
+ return this;
+ }
+
+ public RDFWriterBuilder base(String baseURI) {
+ this.baseURI = baseURI;
+ return this;
+ }
+
+ @Override
+ public RDFWriterBuilder clone() {
+ RDFWriterBuilder clone = new RDFWriterBuilder();
+ clone.dataset = this.dataset;
+ clone.graph = this.graph;
+ clone.context = this.context;
+ clone.lang = this.lang;
+ clone.format = this.format;
+ clone.baseURI = this.baseURI;
+ return clone;
+ }
+
+ public RDFWriter build() {
+ if ( context == null )
+ context = RIOT.getContext().copy();
+ if ( dataset == null && graph == null )
+ throw new RiotException("No source to be written");
+ return new RDFWriter(dataset, graph, format, lang, baseURI, context);
+ }
+
+
+ /** Short form for {@code build().output(outputStream)}.
+ *
+ * @param outputStream
+ */
+ public void output(OutputStream outputStream) {
+ build().output(outputStream);
+ }
+
+ /** Short form for {@code build().output(v)}.
+ *
+ * @param filename
+ */
+ public void output(String filename) {
+ build().output(filename);
+ }
+
+ /** Short form for {@code build().output(v)}.
+ */
+ public String asString() {
+ return build().asString();
+ }
+}
http://git-wip-us.apache.org/repos/asf/jena/blob/ef278645/jena-arq/src/test/java/org/apache/jena/riot/TS_RiotGeneral.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/riot/TS_RiotGeneral.java b/jena-arq/src/test/java/org/apache/jena/riot/TS_RiotGeneral.java
index 2978443..c33b75f 100644
--- a/jena-arq/src/test/java/org/apache/jena/riot/TS_RiotGeneral.java
+++ b/jena-arq/src/test/java/org/apache/jena/riot/TS_RiotGeneral.java
@@ -25,14 +25,15 @@ import org.junit.runners.Suite.SuiteClasses ;
@RunWith(Suite.class)
@SuiteClasses(
{
- TestLangRIOT.class
+ TestSysRIOT.class
+ , TestLangRIOT.class
, TestSyntaxDetermination.class
, TestJenaReaderRIOT.class
, TestReadData.class
, TestRiotReader.class
, TestRDFParser.class
, TestParserRegistry.class
- , TestSysRIOT.class
+ , TestRDFWriter.class
})
public class TS_RiotGeneral
http://git-wip-us.apache.org/repos/asf/jena/blob/ef278645/jena-arq/src/test/java/org/apache/jena/riot/TestRDFWriter.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/riot/TestRDFWriter.java b/jena-arq/src/test/java/org/apache/jena/riot/TestRDFWriter.java
new file mode 100644
index 0000000..73c8ed0
--- /dev/null
+++ b/jena-arq/src/test/java/org/apache/jena/riot/TestRDFWriter.java
@@ -0,0 +1,88 @@
+/*
+ * 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.riot;
+
+import static org.junit.Assert.assertTrue;
+
+import java.io.ByteArrayOutputStream;
+import java.io.CharArrayWriter;
+import java.io.Writer;
+
+import org.apache.jena.atlas.lib.StrUtils;
+import org.apache.jena.graph.Graph;
+import org.apache.jena.riot.Lang;
+import org.apache.jena.riot.RDFWriter;
+import org.apache.jena.riot.RiotException;
+import org.apache.jena.sparql.sse.SSE;
+import org.junit.Test;
+
+public class TestRDFWriter {
+ private static Graph graph = SSE.parseGraph("(graph (:s :p :o))");
+
+ @Test public void rdfwriter_1() {
+ RDFWriter.create().source(graph).build();
+ }
+
+ @Test(expected=RiotException.class)
+ public void rdfwriter_2() {
+ RDFWriter.create().build();
+ }
+
+ @Test public void rdfwriter_3() {
+ String s =
+ RDFWriter.create()
+ .source(graph)
+ .lang(Lang.NT)
+ .asString();
+ assertTrue(s.contains("example/s"));
+ }
+
+ @Test(expected=RiotException.class)
+ public void rdfwriter_4() {
+ String s =
+ RDFWriter.create()
+ // No syntax
+ .source(graph)
+ .asString();
+ }
+
+ @Test public void rdfwriter_5() {
+ ByteArrayOutputStream bout = new ByteArrayOutputStream();
+ RDFWriter.create()
+ .source(graph)
+ .lang(Lang.NT)
+ .output(bout);
+ String s = StrUtils.fromUTF8bytes(bout.toByteArray());
+ assertTrue(s.contains("example/s"));
+ }
+
+ @SuppressWarnings("deprecation")
+ @Test public void rdfwriter_6() {
+ Writer w = new CharArrayWriter();
+ RDFWriter.create()
+ .source(graph)
+ .lang(Lang.NT)
+ .build()
+ .output(w);
+ String s = w.toString();
+ assertTrue(s.contains("example/s"));
+ }
+
+
+}
[13/15] jena git commit: JENA-1323: Merge commit 'refs/pull/242/head'
of github.com:apache/jena
Posted by an...@apache.org.
JENA-1323: Merge commit 'refs/pull/242/head' of github.com:apache/jena
This closes #242.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/f034ba5f
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/f034ba5f
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/f034ba5f
Branch: refs/heads/master
Commit: f034ba5fa1a65d3b5deccc5642fb8a6291e2d428
Parents: bcb0613 ef27864
Author: Andy Seaborne <an...@apache.org>
Authored: Tue Apr 25 18:32:08 2017 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Tue Apr 25 18:32:08 2017 +0100
----------------------------------------------------------------------
.../java/org/apache/jena/riot/RDFDataMgr.java | 14 +-
.../java/org/apache/jena/riot/RDFWriter.java | 220 +++++++++++++++++++
.../org/apache/jena/riot/RDFWriterBuilder.java | 165 ++++++++++++++
.../org/apache/jena/riot/TS_RiotGeneral.java | 5 +-
.../org/apache/jena/riot/TestRDFWriter.java | 88 ++++++++
5 files changed, 482 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
[10/15] jena git commit: Replaced setIterator(Explict NoOp Class)
with setIterator(() -> {}).
Posted by an...@apache.org.
Replaced setIterator(Explict NoOp Class) with setIterator(() -> {}).
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/b21bb38a
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/b21bb38a
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/b21bb38a
Branch: refs/heads/master
Commit: b21bb38ae43c8e6b2f14e4bec65f543a47381f46
Parents: f553715
Author: Chris Dollin <eh...@googlemail.com>
Authored: Mon Apr 24 11:01:33 2017 +0100
Committer: Chris Dollin <eh...@googlemail.com>
Committed: Mon Apr 24 11:01:33 2017 +0100
----------------------------------------------------------------------
.../sparql/engine/iterator/TestQueryIterSort.java | 18 +++++++-----------
1 file changed, 7 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/b21bb38a/jena-arq/src/test/java/org/apache/jena/sparql/engine/iterator/TestQueryIterSort.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/engine/iterator/TestQueryIterSort.java b/jena-arq/src/test/java/org/apache/jena/sparql/engine/iterator/TestQueryIterSort.java
index 07f8c78..7125622 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/engine/iterator/TestQueryIterSort.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/engine/iterator/TestQueryIterSort.java
@@ -88,8 +88,9 @@ public class TestQueryIterSort {
@Test
public void testNoSpill()
{
- iterator.setCallback(new Callback() { @Override
- public void call() { /* do nothing */ } });
+ iterator.setCallback(()->{});
+ //new Callback() { @Override
+ //public void call() { /* do nothing */ } });
assertEquals(0, iterator.getReturnedElementCount());
Context context = new Context() ;
ExecutionContext executionContext = new ExecutionContext(context, (Graph)null, (DatasetGraph)null, (OpExecutorFactory)null) ;
@@ -142,9 +143,7 @@ public class TestQueryIterSort {
}
@Test public void testExhaustionClosesSourceIterator() {
- iterator.setCallback(new Callback()
- { @Override public void call() { /* do nothing */ }
- });
+ iterator.setCallback(() -> {});
Context context = new Context() ;
ExecutionContext ec = new ExecutionContext(context, (Graph) null, (DatasetGraph) null, (OpExecutorFactory) null);
QueryIterSort qis = new QueryIterSort(iterator, comparator, ec);
@@ -167,8 +166,7 @@ public class TestQueryIterSort {
@Test
public void testCleanAfterExhaustion()
{
- iterator.setCallback(new Callback() { @Override
- public void call() { /* do nothing */ } });
+ iterator.setCallback(() -> {});
assertEquals(0, iterator.getReturnedElementCount());
Context context = new Context() ;
context.set(ARQ.spillToDiskThreshold, 10L) ;
@@ -250,8 +248,7 @@ public class TestQueryIterSort {
public void testCancelInterruptsExternalSortAtStartOfIteration()
{
iterator = new CallbackIterator(unsorted.iterator(), 25, null);
- iterator.setCallback(new Callback() { @Override
- public void call() { /* do nothing */ } });
+ iterator.setCallback(()->{});
assertEquals(0, iterator.getReturnedElementCount());
Context context = new Context() ;
context.set(ARQ.spillToDiskThreshold, 10L) ;
@@ -290,8 +287,7 @@ public class TestQueryIterSort {
@Test public void testTopNExhaustionClosesSource() {
- Callback nullCB = new Callback() { @Override public void call() {} };
- iterator.setCallback(nullCB);
+ iterator.setCallback(() -> {});
long numItems = 3;
boolean distinct = false;
[02/15] jena git commit: Merge pull request #4 from apache/master
Posted by an...@apache.org.
Merge pull request #4 from apache/master
sync from original
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/88e68115
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/88e68115
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/88e68115
Branch: refs/heads/master
Commit: 88e6811552cff567a486bfb0863bed8689ae4a49
Parents: b289446 3981cd6
Author: Chris Dollin <eh...@gmail.com>
Authored: Tue Apr 4 15:31:57 2017 +0100
Committer: GitHub <no...@github.com>
Committed: Tue Apr 4 15:31:57 2017 +0100
----------------------------------------------------------------------
.../apache/jena/atlas/web/TypedInputStream.java | 3 +-
.../java/org/apache/jena/riot/web/HttpOp.java | 20 +-
.../src/main/java/riotcmd/CmdLangParse.java | 5 +-
.../org/apache/jena/rdf/model/Resource.java | 6 +-
jena-fuseki2/jena-fuseki-core/fuseki-dev | 5 +
.../jena/fuseki/servlets/SPARQL_Update.java | 16 +-
.../java/org/apache/jena/fuseki/TestAuth.java | 3 +-
jena-parent/pom.xml | 14 +
jena-shaded-guava/pom.xml | 2 +-
jena-text/pom.xml | 93 +++-
.../main/java/examples/JenaESTextExample.java | 99 ++++
.../jena/query/text/DatasetGraphText.java | 7 +-
.../org/apache/jena/query/text/ESSettings.java | 177 ++++++++
.../jena/query/text/TextDatasetFactory.java | 25 ++
.../org/apache/jena/query/text/TextIndex.java | 4 +-
.../org/apache/jena/query/text/TextIndexES.java | 448 +++++++++++++++++++
.../apache/jena/query/text/TextIndexLucene.java | 63 ++-
.../org/apache/jena/query/text/TextQueryPF.java | 65 +--
.../query/text/assembler/TextAssembler.java | 2 +
.../text/assembler/TextIndexESAssembler.java | 114 +++++
.../jena/query/text/assembler/TextVocab.java | 8 +
jena-text/src/main/resources/data-es.ttl | 46 ++
jena-text/src/main/resources/text-config-es.ttl | 64 +++
.../org/apache/jena/query/text/TS_Text.java | 14 +-
.../apache/jena/query/text/it/BaseESTest.java | 111 +++++
.../jena/query/text/it/TextIndexESIT.java | 306 +++++++++++++
pom.xml | 1 +
27 files changed, 1631 insertions(+), 90 deletions(-)
----------------------------------------------------------------------
[07/15] jena git commit: Added some tests for close() on
QueryIterSort ad QueryIterTopN.
Posted by an...@apache.org.
Added some tests for close() on QueryIterSort ad QueryIterTopN.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/2fe3c281
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/2fe3c281
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/2fe3c281
Branch: refs/heads/master
Commit: 2fe3c281aa55605552e66cae8ac1484072c1944a
Parents: 6989f2f
Author: Chris Dollin <eh...@googlemail.com>
Authored: Thu Apr 20 14:53:01 2017 +0100
Committer: Chris Dollin <eh...@googlemail.com>
Committed: Thu Apr 20 14:53:01 2017 +0100
----------------------------------------------------------------------
.../apache/jena/atlas/data/SortedDataBag.java | 1 +
.../sparql/engine/iterator/QueryIterSort.java | 14 ++--
.../sparql/engine/iterator/QueryIterTopN.java | 46 +++++++----
.../engine/iterator/TestQueryIterSort.java | 81 +++++++++++++++++---
4 files changed, 112 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/2fe3c281/jena-arq/src/main/java/org/apache/jena/atlas/data/SortedDataBag.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/atlas/data/SortedDataBag.java b/jena-arq/src/main/java/org/apache/jena/atlas/data/SortedDataBag.java
index a9d2682..ee7aee3 100644
--- a/jena-arq/src/main/java/org/apache/jena/atlas/data/SortedDataBag.java
+++ b/jena-arq/src/main/java/org/apache/jena/atlas/data/SortedDataBag.java
@@ -94,6 +94,7 @@ public class SortedDataBag<E> extends AbstractDataBag<E> {
*/
public void cancel() {
comparator.cancel();
+ close();
}
/**
http://git-wip-us.apache.org/repos/asf/jena/blob/2fe3c281/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterSort.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterSort.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterSort.java
index 3e565db..4485111 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterSort.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterSort.java
@@ -44,9 +44,7 @@ import org.apache.jena.sparql.engine.binding.BindingComparator;
*/
public class QueryIterSort extends QueryIterPlainWrapper {
- private final QueryIterator embeddedIterator; // Keep a record of the
- // underlying source for
- // .cancel.
+ private final QueryIterator embeddedIterator;
final SortedDataBag<Binding> db;
public QueryIterSort(QueryIterator qIter, List<SortCondition> conditions, ExecutionContext context) {
@@ -57,10 +55,8 @@ public class QueryIterSort extends QueryIterPlainWrapper {
final ExecutionContext context) {
super(null, context);
this.embeddedIterator = qIter;
-
ThresholdPolicy<Binding> policy = ThresholdPolicyFactory.policyFromContext(context.getContext());
this.db = BagFactory.newSortedBag(policy, SerializationFactoryFinder.bindingSerializationFactory(), comparator);
-
this.setIterator(new SortedBindingIterator(qIter));
}
@@ -71,6 +67,13 @@ public class QueryIterSort extends QueryIterPlainWrapper {
super.requestCancel();
}
+ @Override
+ protected void closeIterator() {
+ this.db.close();
+ this.embeddedIterator.close();
+ super.closeIterator();
+ }
+
private class SortedBindingIterator extends IteratorDelayedInitialization<Binding> implements Closeable {
private final QueryIterator qIter;
@@ -89,6 +92,7 @@ public class QueryIterSort extends QueryIterPlainWrapper {
// iterator in a try/finally block, and thus will call
// close() themselves.
catch (QueryCancelledException e) {
+ QueryIterSort.this.close();
close();
throw e;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/2fe3c281/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterTopN.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterTopN.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterTopN.java
index 137790d..65bc397 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterTopN.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterTopN.java
@@ -29,6 +29,7 @@ import java.util.PriorityQueue ;
import org.apache.jena.atlas.iterator.Iter ;
import org.apache.jena.atlas.iterator.IteratorDelayedInitialization ;
import org.apache.jena.query.Query ;
+import org.apache.jena.query.QueryCancelledException;
import org.apache.jena.query.QueryExecException ;
import org.apache.jena.query.SortCondition ;
import org.apache.jena.sparql.engine.ExecutionContext ;
@@ -83,26 +84,39 @@ public class QueryIterTopN extends QueryIterPlainWrapper
super.requestCancel() ;
}
+ @Override
+ protected void closeIterator() {
+ this.embeddedIterator.close();
+ super.closeIterator();
+ }
+
private Iterator<Binding> sortTopN(final QueryIterator qIter, final Comparator<Binding> comparator) {
return new IteratorDelayedInitialization<Binding>() {
@Override
protected Iterator<Binding> initializeIterator() {
- while ( qIter.hasNext() ) {
- Binding binding = qIter.next() ;
- if ( heap.size() < limit )
- add(binding) ;
- else {
- Binding currentMaxLeastN = heap.peek() ;
- if ( comparator.compare(binding, currentMaxLeastN) < 0 )
- add(binding) ;
- }
- }
- qIter.close() ;
- Binding[] y = heap.toArray(new Binding[]{}) ;
- heap = null ;
- Arrays.sort(y, comparator) ;
- return asList(y).iterator() ;
- }
+ try {
+ while ( qIter.hasNext() ) {
+ Binding binding = qIter.next() ;
+ if ( heap.size() < limit )
+ add(binding) ;
+ else {
+ Binding currentMaxLeastN = heap.peek() ;
+ if ( comparator.compare(binding, currentMaxLeastN) < 0 )
+ add(binding) ;
+ }
+ }
+ qIter.close() ;
+ Binding[] y = heap.toArray(new Binding[]{}) ;
+ heap = null ;
+ Arrays.sort(y, comparator) ;
+ return asList(y).iterator() ;
+ }
+ catch (QueryCancelledException e) {
+ QueryIterTopN.this.close();
+ this.close();
+ throw e;
+ }
+ }
} ;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/2fe3c281/jena-arq/src/test/java/org/apache/jena/sparql/engine/iterator/TestQueryIterSort.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/engine/iterator/TestQueryIterSort.java b/jena-arq/src/test/java/org/apache/jena/sparql/engine/iterator/TestQueryIterSort.java
index e7eeb68..07f8c78 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/engine/iterator/TestQueryIterSort.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/engine/iterator/TestQueryIterSort.java
@@ -18,9 +18,7 @@
package org.apache.jena.sparql.engine.iterator;
-import static org.junit.Assert.assertEquals ;
-import static org.junit.Assert.assertNotNull ;
-import static org.junit.Assert.assertTrue ;
+import static org.junit.Assert.*;
import java.util.ArrayList ;
import java.util.Iterator ;
@@ -135,6 +133,37 @@ public class TestQueryIterSort {
assertEquals(0, DataBagExaminer.countTemporaryFiles(qIter.db)) ;
}
+ @Test public void testCloseClosesSourceIterator() {
+ Context context = new Context() ;
+ ExecutionContext ec = new ExecutionContext(context, (Graph) null, (DatasetGraph) null, (OpExecutorFactory) null);
+ QueryIterSort qis = new QueryIterSort(iterator, comparator, ec);
+ qis.close();
+ assertTrue("source iterator should have been closed", iterator.isClosed());
+ }
+
+ @Test public void testExhaustionClosesSourceIterator() {
+ iterator.setCallback(new Callback()
+ { @Override public void call() { /* do nothing */ }
+ });
+ Context context = new Context() ;
+ ExecutionContext ec = new ExecutionContext(context, (Graph) null, (DatasetGraph) null, (OpExecutorFactory) null);
+ QueryIterSort qis = new QueryIterSort(iterator, comparator, ec);
+ while (qis.hasNext()) qis.next();
+ assertTrue("source iterator should have been closed", iterator.isClosed());
+ }
+
+ @Test public void testCancelClosesSourceIterator() {
+ Context context = new Context() ;
+ ExecutionContext ec = new ExecutionContext(context, (Graph) null, (DatasetGraph) null, (OpExecutorFactory) null);
+ QueryIterSort qis = new QueryIterSort(iterator, comparator, ec);
+ try {
+ while (qis.hasNext()) qis.next();
+ fail("query should have been cancelled by trigger");
+ } catch (QueryCancelledException q) {
+ assertTrue("source iterator should have been closed", iterator.isClosed());
+ }
+ }
+
@Test
public void testCleanAfterExhaustion()
{
@@ -248,6 +277,32 @@ public class TestQueryIterSort {
assertEquals(0, DataBagExaminer.countTemporaryFiles(qIter.db)) ;
}
+ @Test public void testTopNCloseClosesSource() {
+
+ long numItems = 3;
+ boolean distinct = false;
+ Context context = new Context() ;
+ ExecutionContext ec = new ExecutionContext(context, (Graph) null, (DatasetGraph) null, (OpExecutorFactory) null);
+ QueryIterTopN tn = new QueryIterTopN(iterator, comparator, numItems, distinct, ec);
+ tn.close();
+ assertTrue(iterator.isClosed());
+ }
+
+ @Test public void testTopNExhaustionClosesSource() {
+
+ Callback nullCB = new Callback() { @Override public void call() {} };
+ iterator.setCallback(nullCB);
+
+ long numItems = 3;
+ boolean distinct = false;
+ Context context = new Context() ;
+ ExecutionContext ec = new ExecutionContext(context, (Graph) null, (DatasetGraph) null, (OpExecutorFactory) null);
+ QueryIterTopN tn = new QueryIterTopN(iterator, comparator, numItems, distinct, ec);
+ while (tn.hasNext()) tn.next();
+ assertTrue(iterator.isClosed());
+ }
+
+
private Binding randomBinding(Var[] vars)
{
BindingMap binding = BindingFactory.create();
@@ -279,13 +334,14 @@ public class TestQueryIterSort {
}
- private class CallbackIterator implements QueryIterator
+ private static class CallbackIterator implements QueryIterator
{
int elementsReturned = 0 ;
Callback callback ;
int trigger ;
Iterator<Binding> delegate ;
boolean canceled = false ;
+ boolean closed = false ;
public CallbackIterator(Iterator<Binding> delegate, int trigger, Callback callback)
{
@@ -302,7 +358,10 @@ public class TestQueryIterSort {
@Override
public boolean hasNext()
{
- return delegate.hasNext() ;
+ // self-closing
+ boolean has = delegate.hasNext() ;
+ if (has == false) closed = true;
+ return has ;
}
@Override
@@ -326,6 +385,10 @@ public class TestQueryIterSort {
return elementsReturned ;
}
+ public boolean isClosed() {
+ return closed ;
+ }
+
public boolean isCanceled() {
return canceled ;
}
@@ -339,10 +402,10 @@ public class TestQueryIterSort {
@Override
public void cancel() { canceled = true ; }
-
+
@Override
- public void close() { throw new ARQNotImplemented() ; }
-
+ public void close() { closed = true ; }
+
@Override
public void output(IndentedWriter out, SerializationContext sCxt) { throw new ARQNotImplemented() ; }
@@ -354,7 +417,7 @@ public class TestQueryIterSort {
}
- private interface Callback
+ public interface Callback
{
public void call() ;
}
[11/15] jena git commit: Cleaned up layout -- tabes to spaces,
correct indentation.
Posted by an...@apache.org.
Cleaned up layout -- tabes to spaces, correct indentation.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/55153f67
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/55153f67
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/55153f67
Branch: refs/heads/master
Commit: 55153f672e6f3fb69055c15712473e69167579be
Parents: b21bb38
Author: Chris Dollin <eh...@googlemail.com>
Authored: Mon Apr 24 11:08:56 2017 +0100
Committer: Chris Dollin <eh...@googlemail.com>
Committed: Mon Apr 24 11:08:56 2017 +0100
----------------------------------------------------------------------
.../engine/iterator/TestQueryIterSort.java | 104 ++++++++++---------
1 file changed, 53 insertions(+), 51 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/55153f67/jena-arq/src/test/java/org/apache/jena/sparql/engine/iterator/TestQueryIterSort.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/engine/iterator/TestQueryIterSort.java b/jena-arq/src/test/java/org/apache/jena/sparql/engine/iterator/TestQueryIterSort.java
index 7125622..4931a06 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/engine/iterator/TestQueryIterSort.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/engine/iterator/TestQueryIterSort.java
@@ -134,34 +134,37 @@ public class TestQueryIterSort {
assertEquals(0, DataBagExaminer.countTemporaryFiles(qIter.db)) ;
}
- @Test public void testCloseClosesSourceIterator() {
- Context context = new Context() ;
- ExecutionContext ec = new ExecutionContext(context, (Graph) null, (DatasetGraph) null, (OpExecutorFactory) null);
- QueryIterSort qis = new QueryIterSort(iterator, comparator, ec);
- qis.close();
- assertTrue("source iterator should have been closed", iterator.isClosed());
+ @Test
+ public void testCloseClosesSourceIterator() {
+ Context context = new Context() ;
+ ExecutionContext ec = new ExecutionContext(context, (Graph) null, (DatasetGraph) null, (OpExecutorFactory) null);
+ QueryIterSort qis = new QueryIterSort(iterator, comparator, ec);
+ qis.close();
+ assertTrue("source iterator should have been closed", iterator.isClosed());
}
- @Test public void testExhaustionClosesSourceIterator() {
- iterator.setCallback(() -> {});
- Context context = new Context() ;
- ExecutionContext ec = new ExecutionContext(context, (Graph) null, (DatasetGraph) null, (OpExecutorFactory) null);
- QueryIterSort qis = new QueryIterSort(iterator, comparator, ec);
- while (qis.hasNext()) qis.next();
- assertTrue("source iterator should have been closed", iterator.isClosed());
- }
+ @Test
+ public void testExhaustionClosesSourceIterator() {
+ iterator.setCallback(() -> {});
+ Context context = new Context() ;
+ ExecutionContext ec = new ExecutionContext(context, (Graph) null, (DatasetGraph) null, (OpExecutorFactory) null);
+ QueryIterSort qis = new QueryIterSort(iterator, comparator, ec);
+ while (qis.hasNext()) qis.next();
+ assertTrue("source iterator should have been closed", iterator.isClosed());
+ }
- @Test public void testCancelClosesSourceIterator() {
- Context context = new Context() ;
- ExecutionContext ec = new ExecutionContext(context, (Graph) null, (DatasetGraph) null, (OpExecutorFactory) null);
- QueryIterSort qis = new QueryIterSort(iterator, comparator, ec);
- try {
- while (qis.hasNext()) qis.next();
- fail("query should have been cancelled by trigger");
- } catch (QueryCancelledException q) {
- assertTrue("source iterator should have been closed", iterator.isClosed());
- }
- }
+ @Test
+ public void testCancelClosesSourceIterator() {
+ Context context = new Context() ;
+ ExecutionContext ec = new ExecutionContext(context, (Graph) null, (DatasetGraph) null, (OpExecutorFactory) null);
+ QueryIterSort qis = new QueryIterSort(iterator, comparator, ec);
+ try {
+ while (qis.hasNext()) qis.next();
+ fail("query should have been cancelled by trigger");
+ } catch (QueryCancelledException q) {
+ assertTrue("source iterator should have been closed", iterator.isClosed());
+ }
+ }
@Test
public void testCleanAfterExhaustion()
@@ -274,28 +277,27 @@ public class TestQueryIterSort {
assertEquals(0, DataBagExaminer.countTemporaryFiles(qIter.db)) ;
}
- @Test public void testTopNCloseClosesSource() {
-
- long numItems = 3;
- boolean distinct = false;
- Context context = new Context() ;
- ExecutionContext ec = new ExecutionContext(context, (Graph) null, (DatasetGraph) null, (OpExecutorFactory) null);
- QueryIterTopN tn = new QueryIterTopN(iterator, comparator, numItems, distinct, ec);
- tn.close();
- assertTrue(iterator.isClosed());
- }
-
- @Test public void testTopNExhaustionClosesSource() {
-
- iterator.setCallback(() -> {});
+ @Test
+ public void testTopNCloseClosesSource() {
+ long numItems = 3;
+ boolean distinct = false;
+ Context context = new Context() ;
+ ExecutionContext ec = new ExecutionContext(context, (Graph) null, (DatasetGraph) null, (OpExecutorFactory) null);
+ QueryIterTopN tn = new QueryIterTopN(iterator, comparator, numItems, distinct, ec);
+ tn.close();
+ assertTrue(iterator.isClosed());
+ }
- long numItems = 3;
- boolean distinct = false;
- Context context = new Context() ;
- ExecutionContext ec = new ExecutionContext(context, (Graph) null, (DatasetGraph) null, (OpExecutorFactory) null);
- QueryIterTopN tn = new QueryIterTopN(iterator, comparator, numItems, distinct, ec);
- while (tn.hasNext()) tn.next();
- assertTrue(iterator.isClosed());
+ @Test
+ public void testTopNExhaustionClosesSource() {
+ iterator.setCallback(() -> {});
+ long numItems = 3;
+ boolean distinct = false;
+ Context context = new Context() ;
+ ExecutionContext ec = new ExecutionContext(context, (Graph) null, (DatasetGraph) null, (OpExecutorFactory) null);
+ QueryIterTopN tn = new QueryIterTopN(iterator, comparator, numItems, distinct, ec);
+ while (tn.hasNext()) tn.next();
+ assertTrue(iterator.isClosed());
}
@@ -354,10 +356,10 @@ public class TestQueryIterSort {
@Override
public boolean hasNext()
{
- // self-closing
- boolean has = delegate.hasNext() ;
- if (has == false) closed = true;
- return has ;
+ // self-closing
+ boolean has = delegate.hasNext() ;
+ if (has == false) closed = true;
+ return has ;
}
@Override
@@ -382,7 +384,7 @@ public class TestQueryIterSort {
}
public boolean isClosed() {
- return closed ;
+ return closed ;
}
public boolean isCanceled() {
[05/15] jena git commit: Merge pull request #6 from apache/master
Posted by an...@apache.org.
Merge pull request #6 from apache/master
update from original
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/6989f2ff
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/6989f2ff
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/6989f2ff
Branch: refs/heads/master
Commit: 6989f2ff591981cccae59789636cb2401070368d
Parents: 61e8917 b386e4a
Author: Chris Dollin <eh...@gmail.com>
Authored: Wed Apr 19 11:46:32 2017 +0100
Committer: GitHub <no...@github.com>
Committed: Wed Apr 19 11:46:32 2017 +0100
----------------------------------------------------------------------
.../arq/examples/riot/ExRIOT_5.java | 16 +-
.../main/java/org/apache/jena/riot/Lang.java | 7 +-
.../java/org/apache/jena/riot/RDFDataMgr.java | 15 +-
.../java/org/apache/jena/riot/RDFLanguages.java | 36 +-
.../java/org/apache/jena/riot/RDFParser.java | 102 +-
.../org/apache/jena/riot/RDFParserBuilder.java | 68 +-
.../org/apache/jena/riot/RDFParserRegistry.java | 87 +-
.../java/org/apache/jena/riot/ReaderRIOT.java | 17 +-
.../org/apache/jena/riot/ReaderRIOTFactory.java | 11 +-
.../jena/riot/adapters/AdapterFileManager.java | 6 +-
.../org/apache/jena/riot/lang/JsonLDReader.java | 50 +-
.../org/apache/jena/riot/lang/LangBase.java | 9 +-
.../java/org/apache/jena/riot/lang/LangCSV.java | 152 ---
.../org/apache/jena/riot/lang/LangEngine.java | 199 ++--
.../org/apache/jena/riot/lang/LangNQuads.java | 5 +-
.../org/apache/jena/riot/lang/LangNTuple.java | 4 +-
.../org/apache/jena/riot/lang/LangRDFJSON.java | 1 -
.../org/apache/jena/riot/lang/LangRDFXML.java | 250 -----
.../org/apache/jena/riot/lang/LangRIOT.java | 7 +-
.../org/apache/jena/riot/lang/LangTriG.java | 4 +-
.../apache/jena/riot/lang/LangTurtleBase.java | 63 +-
.../apache/jena/riot/lang/ReaderRDFNULL.java | 33 +-
.../apache/jena/riot/lang/ReaderRIOTCSV.java | 141 +++
.../apache/jena/riot/lang/ReaderRIOTRDFXML.java | 245 +++++
.../org/apache/jena/riot/lang/ReaderTriX.java | 63 +-
.../org/apache/jena/riot/lang/RiotParsers.java | 233 ++---
.../process/normalize/CanonicalizeLiteral.java | 2 +-
.../jena/riot/resultset/ResultSetLang.java | 12 +-
.../org/apache/jena/riot/system/MakerRDF.java | 77 --
.../apache/jena/riot/system/MakerRDFStd.java | 303 ------
.../apache/jena/riot/system/ParserProfile.java | 113 ++-
.../jena/riot/system/ParserProfileBase.java | 219 -----
.../jena/riot/system/ParserProfileChecker.java | 140 ---
.../jena/riot/system/ParserProfileStd.java | 269 ++++++
.../org/apache/jena/riot/system/RiotLib.java | 344 +++----
.../riot/system/SerializationFactoryFinder.java | 21 +-
.../apache/jena/riot/tokens/TokenizerText.java | 930 +++++++++----------
.../apache/jena/riot/writer/JsonLDWriter.java | 12 +-
.../engine/binding/BindingInputStream.java | 9 +-
.../org/apache/jena/sparql/expr/E_Regex.java | 30 +-
.../org/apache/jena/sparql/expr/RegexJava.java | 9 +-
.../apache/jena/sparql/expr/RegexXerces.java | 4 +-
.../jena/sparql/path/eval/PathEngineSPARQL.java | 18 +-
.../sparql/sse/builders/ExprBuildException.java | 11 +-
.../apache/jena/riot/ErrorHandlerTestLib.java | 2 +
.../org/apache/jena/riot/TestRDFParser.java | 14 +-
.../jena/riot/lang/ParserTestBaseLib.java | 7 +-
.../org/apache/jena/riot/lang/TestLangCSV.java | 4 +-
.../apache/jena/riot/lang/TestLangNTriples.java | 16 +-
.../apache/jena/riot/lang/TestLangNTuples.java | 28 +-
.../apache/jena/riot/lang/TestLangRdfJson.java | 3 +-
.../apache/jena/riot/lang/TestLangTurtle.java | 9 +-
.../jena/riot/lang/TestParserFactory.java | 45 +-
.../apache/jena/riot/lang/TestTriXReader.java | 2 +-
.../apache/jena/riot/lang/TestTurtleTerms.java | 8 +-
.../jena/riot/writer/TestJsonLDWriter.java | 161 +++-
.../org/apache/jena/sparql/expr/TestRegex.java | 7 +
.../org/apache/jena/sparql/path/TestPath.java | 20 +
.../jena/atlas/logging/java/FlatFormatter.java | 4 +-
.../jena/atlas/logging/java/FlatHandler.java | 4 +-
.../jena/atlas/logging/java/TextFormatter.java | 8 +-
.../main/java/arq/cmdline/ModLangOutput.java | 1 +
.../java/org/apache/jena/lang/csv/CSV2RDF.java | 47 +
.../java/org/apache/jena/lang/csv/InitCSV.java | 38 +
.../org/apache/jena/lang/csv/ReaderRIOTCSV.java | 132 +++
.../jena/lang/csv/ReaderRIOTFactoryCSV.java | 31 +
.../jena/propertytable/PropertyTable.java | 1 +
.../jena/propertytable/graph/GraphCSV.java | 1 +
.../impl/PropertyTableBuilder.java | 8 +-
.../apache/jena/propertytable/lang/CSV2RDF.java | 10 +-
.../apache/jena/propertytable/lang/LangCSV.java | 154 ---
.../lang/ReaderRIOTFactoryCSV.java | 32 -
.../propertytable/lang/ReaderRIOTLangCSV.java | 76 --
jena-csv/src/main/java/riotcmdx/csv2rdf.java | 4 +-
...rg.apache.jena.system.JenaSubsystemLifecycle | 2 +-
.../org/apache/jena/lang/csv/TS_LangCSV.java | 28 +
.../org/apache/jena/lang/csv/TestLangCSV.java | 114 +++
.../jena/propertytable/TS_PropertyTable.java | 2 -
.../jena/propertytable/lang/TestLangCSV.java | 111 ---
jena-csv/src/test/resources/test.csv | 6 +-
.../jena/hadoop/rdf/io/types/RdfTypesTest.java | 1 -
.../io/input/AbstractNLineFileInputFormat.java | 1 +
.../AbstractBlockBasedNodeTupleReader.java | 33 +-
.../AbstractLineBasedNodeTupleReader.java | 36 +-
.../readers/AbstractLineBasedQuadReader.java | 8 +-
.../readers/AbstractLineBasedTripleReader.java | 8 +-
.../AbstractWholeFileNodeTupleReader.java | 23 +-
.../io/input/readers/TriplesOrQuadsReader.java | 1 -
.../io/input/readers/nquads/NQuadsReader.java | 14 +-
.../input/readers/ntriples/NTriplesReader.java | 12 +-
.../hadoop/rdf/io/input/util/RdfIOUtils.java | 25 +-
.../writers/AbstractBatchedQuadWriter.java | 2 +-
.../writers/AbstractWholeFileQuadWriter.java | 2 +-
.../AbstractWholeFileQuadInputFormatTests.java | 2 +-
.../io/input/bnodes/AbstractBlankNodeTests.java | 3 -
.../io/input/bnodes/RdfThriftBlankNodeTest.java | 2 +-
...CompressedWholeFileQuadInputFormatTests.java | 2 +-
.../util/AbstractTrackableInputStreamTests.java | 91 +-
.../rdf/io/input/util/BlockInputStreamTest.java | 16 +-
.../AbstractNodeTupleOutputFormatTests.java | 1 -
.../output/trig/TriGBlankNodeOutputTests.java | 6 +-
.../turtle/TurtleBlankNodeOutputTests.java | 4 +
.../group/AbstractQuadGroupingMapper.java | 1 +
.../filter/AbstractQuadValidityFilterTests.java | 2 +-
.../AbstractTripleValidityFilterTests.java | 2 +-
.../apache/jena/hadoop/rdf/stats/RdfStats.java | 86 +-
jena-parent/pom.xml | 29 +-
.../java/org/apache/jena/sdb/sql/TableDump.java | 4 +-
.../apache/jena/sdb/store/TupleLoaderOne.java | 3 +-
.../java/org/apache/jena/sdb/util/StrUtils.java | 4 +-
.../src/main/java/org/apache/jena/tdb/TDB.java | 4 +-
jena-text/pom.xml | 49 +-
.../org/apache/jena/query/text/TextIndexES.java | 4 +-
.../text/assembler/TextIndexESAssembler.java | 1 -
.../assembler/TextIndexLuceneAssembler.java | 1 +
.../jena/query/text/it/TextIndexESIT.java | 4 +-
116 files changed, 2829 insertions(+), 3145 deletions(-)
----------------------------------------------------------------------
[06/15] jena git commit: JENA-1324: Check for spaces in URIs (if RDF
1.1)
Posted by an...@apache.org.
JENA-1324: Check for spaces in URIs (if RDF 1.1)
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/6165a44b
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/6165a44b
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/6165a44b
Branch: refs/heads/master
Commit: 6165a44b419d18ff6809f2bad6ee78453bdca7d3
Parents: b386e4a
Author: Andy Seaborne <an...@apache.org>
Authored: Tue Apr 18 21:38:13 2017 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Wed Apr 19 19:01:48 2017 +0100
----------------------------------------------------------------------
.../apache/jena/riot/lang/ReaderRIOTRDFXML.java | 27 ++++++++++++++------
1 file changed, 19 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/6165a44b/jena-arq/src/main/java/org/apache/jena/riot/lang/ReaderRIOTRDFXML.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/lang/ReaderRIOTRDFXML.java b/jena-arq/src/main/java/org/apache/jena/riot/lang/ReaderRIOTRDFXML.java
index 4b3e5df..597ad7b 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/lang/ReaderRIOTRDFXML.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/lang/ReaderRIOTRDFXML.java
@@ -22,6 +22,7 @@ import java.io.IOException ;
import java.io.InputStream ;
import java.io.Reader ;
+import org.apache.jena.JenaRuntime;
import org.apache.jena.atlas.lib.Pair ;
import org.apache.jena.atlas.web.ContentType;
import org.apache.jena.datatypes.RDFDatatype ;
@@ -29,6 +30,7 @@ import org.apache.jena.datatypes.TypeMapper ;
import org.apache.jena.graph.Node ;
import org.apache.jena.graph.NodeFactory ;
import org.apache.jena.graph.Triple ;
+import org.apache.jena.iri.IRIFactory;
import org.apache.jena.rdf.model.RDFErrorHandler ;
import org.apache.jena.rdfxml.xmlinput.* ;
import org.apache.jena.rdfxml.xmlinput.impl.ARPSaxErrorHandler ;
@@ -37,9 +39,7 @@ import org.apache.jena.riot.ReaderRIOT;
import org.apache.jena.riot.ReaderRIOTFactory;
import org.apache.jena.riot.SysRIOT;
import org.apache.jena.riot.checker.CheckerLiterals ;
-import org.apache.jena.riot.system.ErrorHandler ;
-import org.apache.jena.riot.system.ParserProfile ;
-import org.apache.jena.riot.system.StreamRDF ;
+import org.apache.jena.riot.system.*;
import org.apache.jena.sparql.util.Context;
import org.xml.sax.SAXException ;
import org.xml.sax.SAXParseException ;
@@ -53,11 +53,24 @@ public class ReaderRIOTRDFXML implements ReaderRIOT
public static class Factory implements ReaderRIOTFactory {
@Override
public ReaderRIOT create(Lang language, ParserProfile parserProfile) {
+ // Ignore the provided ParserProfile
+ // ARP predates RIOT and does many things internall already.
+ // Thisincludes IRI resolution.
return new ReaderRIOTRDFXML(parserProfile.getErrorHandler()) ;
}
}
+ // RDF 1.1 is based on URIs/IRIs, where space are not allowed.
+ // RDF 1.0 (and RDF/XML) was based on "RDF URI References" which did allow spaces.
+ static {
+ if ( JenaRuntime.isRDF11 ) {
+ ARPOptions.setIRIFactoryGlobal(IRIFactory.iriImplementation());
+ }
+ }
+
private ARP arp = new ARP() ;
+ // arp.getOptions.setIRIFactory does not work if called this early : it gets overwritten in JenaReader.
+ // Using ARPOptions.setIRIFactoryGlobal does work.
private InputStream input = null ;
private Reader reader = null ;
@@ -142,13 +155,13 @@ public class ReaderRIOTRDFXML implements ReaderRIOT
private static class HandlerSink extends ARPSaxErrorHandler implements StatementHandler, NamespaceHandler {
private StreamRDF output ;
- private ErrorHandler errHandler ;
+ private ErrorHandler riotErrorHandler ;
private CheckerLiterals checker ;
HandlerSink(StreamRDF output, ErrorHandler errHandler) {
super(new ErrorHandlerBridge(errHandler)) ;
this.output = output ;
- this.errHandler = errHandler ;
+ this.riotErrorHandler = errHandler ;
this.checker = new CheckerLiterals(errHandler) ;
}
@@ -172,10 +185,9 @@ public class ReaderRIOTRDFXML implements ReaderRIOT
RDFDatatype dt = TypeMapper.getInstance().getSafeTypeByName(dtURI);
return NodeFactory.createLiteral(lit.toString(), dt);
-
}
- private static Node convert(AResource r) {
+ private Node convert(AResource r) {
if (!r.isAnonymous())
return NodeFactory.createURI(r.getURI());
@@ -186,7 +198,6 @@ public class ReaderRIOTRDFXML implements ReaderRIOT
r.setUserData(rr);
}
return rr;
-
}
private Triple convert(AResource s, AResource p, AResource o) {
[03/15] jena git commit: Merge pull request #5 from apache/master
Posted by an...@apache.org.
Merge pull request #5 from apache/master
synching with apache/jena
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/61e89175
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/61e89175
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/61e89175
Branch: refs/heads/master
Commit: 61e891752b12e842d888d48780fb324002853eb9
Parents: 88e6811 0174c61
Author: Chris Dollin <eh...@gmail.com>
Authored: Thu Apr 6 08:42:39 2017 +0100
Committer: GitHub <no...@github.com>
Committed: Thu Apr 6 08:42:39 2017 +0100
----------------------------------------------------------------------
apache-jena/bin/arq | 2 +-
apache-jena/bin/infer | 2 +-
apache-jena/bin/iri | 2 +-
apache-jena/bin/juuid | 2 +-
apache-jena/bin/nquads | 2 +-
apache-jena/bin/ntriples | 2 +-
apache-jena/bin/qparse | 2 +-
apache-jena/bin/rdfcat | 2 +-
apache-jena/bin/rdfcompare | 2 +-
apache-jena/bin/rdfcopy | 2 +-
apache-jena/bin/rdfdiff | 2 +-
apache-jena/bin/rdfparse | 2 +-
apache-jena/bin/rdfxml | 2 +-
apache-jena/bin/riot | 2 +-
apache-jena/bin/rset | 2 +-
apache-jena/bin/rsparql | 2 +-
apache-jena/bin/rupdate | 2 +-
apache-jena/bin/schemagen | 2 +-
apache-jena/bin/sparql | 2 +-
apache-jena/bin/tdbbackup | 2 +-
apache-jena/bin/tdbdump | 2 +-
apache-jena/bin/tdbloader | 2 +-
apache-jena/bin/tdbquery | 2 +-
apache-jena/bin/tdbstats | 2 +-
apache-jena/bin/tdbupdate | 2 +-
apache-jena/bin/trig | 2 +-
apache-jena/bin/turtle | 2 +-
apache-jena/bin/uparse | 2 +-
apache-jena/bin/update | 2 +-
apache-jena/bin/utf8 | 2 +-
apache-jena/bin/wwwdec | 2 +-
apache-jena/bin/wwwenc | 2 +-
apache-jena/template.bin | 2 +-
.../arq/examples/riot/ExRIOT_5.java | 2 +-
.../java/org/apache/jena/riot/RDFDataMgr.java | 2 +-
.../java/org/apache/jena/riot/RDFParser.java | 78 +++++--
.../org/apache/jena/riot/RDFParserBuilder.java | 66 +++++-
.../org/apache/jena/riot/RDFParserRegistry.java | 37 +--
.../org/apache/jena/riot/ReaderRIOTFactory.java | 18 +-
.../org/apache/jena/riot/lang/JsonLDReader.java | 44 ++--
.../org/apache/jena/riot/lang/LangBase.java | 35 ++-
.../org/apache/jena/riot/lang/ReaderTriX.java | 57 +++--
.../org/apache/jena/riot/lang/RiotParsers.java | 127 +++++------
.../jena/riot/process/StreamRDFApplyObject.java | 56 +++++
.../process/normalize/CanonicalizeLiteral.java | 5 +
.../riot/process/normalize/DatatypeHandler.java | 2 +-
.../riot/process/normalize/NormalizeValue.java | 13 +-
.../normalize/StreamCanonicalLiterals.java | 54 +++++
.../org/apache/jena/riot/system/MakerRDF.java | 2 +-
.../apache/jena/riot/system/MakerRDFStd.java | 10 -
.../apache/jena/riot/system/ParserProfile.java | 4 +-
.../jena/riot/system/ParserProfileBase.java | 11 -
.../org/apache/jena/riot/system/RiotLib.java | 21 +-
.../java/org/apache/jena/riot/web/HttpOp.java | 2 +
.../org/apache/jena/riot/TestRDFParser.java | 33 +--
.../apache/jena/riot/lang/TestLangNTuples.java | 223 +++++++++----------
.../apache/jena/riot/lang/TestTriXReader.java | 7 +-
.../jena/riot/process/TestNormalization.java | 64 +++---
.../src/main/java/riotcmd/CmdLangParse.java | 4 +-
.../java/org/apache/jena/rdf/model/Literal.java | 5 +-
.../lang/ReaderRIOTFactoryCSV.java | 5 +-
.../AbstractBlockBasedNodeTupleReader.java | 9 +-
.../AbstractLineBasedNodeTupleReader.java | 3 +-
.../AbstractWholeFileNodeTupleReader.java | 7 +-
.../hadoop/rdf/io/input/util/RdfIOUtils.java | 2 +
pom.xml | 2 +-
66 files changed, 638 insertions(+), 438 deletions(-)
----------------------------------------------------------------------
[14/15] jena git commit: JENA-1320: Merge commit 'refs/pull/244/head'
of github.com:apache/jena
Posted by an...@apache.org.
JENA-1320: Merge commit 'refs/pull/244/head' of github.com:apache/jena
This closes #244.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/0cbea575
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/0cbea575
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/0cbea575
Branch: refs/heads/master
Commit: 0cbea575c3d9c6acf5812119bf597e88b35af41b
Parents: f034ba5 55153f6
Author: Andy Seaborne <an...@apache.org>
Authored: Tue Apr 25 18:32:38 2017 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Tue Apr 25 18:32:38 2017 +0100
----------------------------------------------------------------------
.../apache/jena/atlas/data/SortedDataBag.java | 1 +
.../sparql/engine/iterator/QueryIterSort.java | 14 +--
.../sparql/engine/iterator/QueryIterTopN.java | 46 ++++++----
.../engine/iterator/TestQueryIterSort.java | 91 ++++++++++++++++----
4 files changed, 116 insertions(+), 36 deletions(-)
----------------------------------------------------------------------
[12/15] jena git commit: JENA-1324: Merge commit 'refs/pull/243/head'
of github.com:apache/jena
Posted by an...@apache.org.
JENA-1324: Merge commit 'refs/pull/243/head' of github.com:apache/jena
This closes #243.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/bcb06139
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/bcb06139
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/bcb06139
Branch: refs/heads/master
Commit: bcb061395b0daf3754a0e0c27c7d49da32c6c2ec
Parents: ea5e358 4e48155
Author: Andy Seaborne <an...@apache.org>
Authored: Tue Apr 25 18:31:17 2017 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Tue Apr 25 18:31:17 2017 +0100
----------------------------------------------------------------------
.../apache/jena/riot/lang/ReaderRIOTRDFXML.java | 59 ++++++++++++++------
1 file changed, 43 insertions(+), 16 deletions(-)
----------------------------------------------------------------------