You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2015/08/20 20:18:37 UTC
[1/6] jena git commit: Deprecate various functions.
Repository: jena
Updated Branches:
refs/heads/master d8fb3175a -> 4237973df
Deprecate various functions.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/0ad30366
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/0ad30366
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/0ad30366
Branch: refs/heads/master
Commit: 0ad303669e936626972610072db2592c0dcf34da
Parents: d8fb317
Author: Andy Seaborne <an...@apache.org>
Authored: Thu Aug 20 18:17:05 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Thu Aug 20 18:17:05 2015 +0100
----------------------------------------------------------------------
.../java/org/apache/jena/riot/RiotReader.java | 32 +++++++++++++-------
1 file changed, 21 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/0ad30366/jena-arq/src/main/java/org/apache/jena/riot/RiotReader.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/RiotReader.java b/jena-arq/src/main/java/org/apache/jena/riot/RiotReader.java
index df7d7e5..315ed75 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/RiotReader.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/RiotReader.java
@@ -89,7 +89,9 @@ public class RiotReader
* @param in Source for bytes to parse.
* @param lang Language.
* @param dest Where to send the triples from the parser.
- */
+ * @deprecated use {@link RDFDataMgr#parse(StreamRDF, InputStream, Lang)}
+ */
+ @Deprecated
public static void parse(InputStream in, Lang lang, StreamRDF dest)
{
parse(in, lang, null, dest) ;
@@ -100,7 +102,9 @@ public class RiotReader
* @param lang Language.
* @param baseIRI Base IRI.
* @param dest Where to send the triples from the parser.
- */
+ * @deprecated use {@link RDFDataMgr#parse(StreamRDF, InputStream, String, Lang)}
+ */
+ @Deprecated
public static void parse(InputStream in, Lang lang, String baseIRI, StreamRDF dest)
{
RDFDataMgr.parse(dest, in, baseIRI, lang);
@@ -112,8 +116,9 @@ public class RiotReader
* Must be in a triples syntax.
* @param filename
* @param sink Where to send the triples from the parser.
- * @see RiotReader#parse(String,StreamRDF)
- */
+ * @deprecated Use an {@link StreamRDF} and {@link RDFDataMgr#parse(StreamRDF, String)}
+ */
+ @Deprecated
public static void parseTriples(String filename, Sink<Triple> sink)
{ parseTriples(filename, null, null, sink) ; }
@@ -123,8 +128,9 @@ public class RiotReader
* @param lang Language, or null for "guess from URL" (e.g. file extension)
* @param baseIRI Base IRI, or null for based on input filename
* @param sink Where to send the triples from the parser.
- * @see RiotReader#parse
- */
+ * @deprecated Use an {@link StreamRDF} and {@link RDFDataMgr#parse(StreamRDF, String, String, Lang)}
+ */
+ @Deprecated
public static void parseTriples(String filename, Lang lang, String baseIRI, Sink<Triple> sink)
{
StreamRDF dest = StreamRDFLib.sinkTriples(sink) ;
@@ -136,8 +142,9 @@ public class RiotReader
* @param lang Language.
* @param baseIRI Base IRI.
* @param sink Where to send the triples from the parser.
- * @see RiotReader#parse
- */
+ * @deprecated Use an {@link StreamRDF} and {@link RDFDataMgr#parse(StreamRDF, InputStream, Lang)}
+ */
+ @Deprecated
public static void parseTriples(InputStream in, Lang lang, String baseIRI, Sink<Triple> sink)
{
StreamRDF dest = StreamRDFLib.sinkTriples(sink) ;
@@ -149,8 +156,9 @@ public class RiotReader
/** Parse a file, sending quads to a sink.
* @param filename
* @param sink Where to send the quads from the parser.
- * @see RiotReader#parse
+ * @deprecated Use an {@link StreamRDF} and {@link RDFDataMgr#parse(StreamRDF, String)}
*/
+ @Deprecated
public static void parseQuads(String filename, Sink<Quad> sink)
{ parseQuads(filename, null, null, sink) ; }
@@ -159,8 +167,9 @@ public class RiotReader
* @param lang Language, or null for "guess from filename" (e.g. extension)
* @param baseIRI Base IRI, or null for base on input filename
* @param sink Where to send the quads from the parser.
- * @see RiotReader#parse
+ * @deprecated Use an {@link StreamRDF} and {@link RDFDataMgr#parse(StreamRDF, String, String, Lang)}
*/
+ @Deprecated
public static void parseQuads(String filename, Lang lang, String baseIRI, Sink<Quad> sink)
{
StreamRDF dest = StreamRDFLib.sinkQuads(sink) ;
@@ -172,8 +181,9 @@ public class RiotReader
* @param lang Language.
* @param baseIRI Base IRI.
* @param sink Where to send the quads from the parser.
- * @see RiotReader#parse
+ * @deprecated Use an {@link StreamRDF} and {@link RDFDataMgr#parse(StreamRDF, InputStream, String, Lang)}
*/
+ @Deprecated
public static void parseQuads(InputStream in, Lang lang, String baseIRI, Sink<Quad> sink)
{
StreamRDF dest = StreamRDFLib.sinkQuads(sink) ;
[5/6] jena git commit: JENA-1012: start/finish not needed here.
Posted by an...@apache.org.
JENA-1012: start/finish not needed here.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/7bd750c2
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/7bd750c2
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/7bd750c2
Branch: refs/heads/master
Commit: 7bd750c21137e66582f2a07dc089d371c2ed6525
Parents: 503bdcf
Author: Andy Seaborne <an...@apache.org>
Authored: Thu Aug 20 19:13:29 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Thu Aug 20 19:18:07 2015 +0100
----------------------------------------------------------------------
jena-arq/src/main/java/org/apache/jena/riot/RiotReader.java | 4 ----
1 file changed, 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/7bd750c2/jena-arq/src/main/java/org/apache/jena/riot/RiotReader.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/RiotReader.java b/jena-arq/src/main/java/org/apache/jena/riot/RiotReader.java
index 11b1c11..be35fd5 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/RiotReader.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/RiotReader.java
@@ -215,9 +215,7 @@ public class RiotReader
@Override
public void run()
{
- out.start();
RDFDataMgr.parse(out, input, baseIRI, lang);
- out.finish() ;
}
});
t.start();
@@ -251,9 +249,7 @@ public class RiotReader
@Override
public void run()
{
- out.start();
RDFDataMgr.parse(out, input, baseIRI, lang);
- out.finish() ;
}
});
t.start();
[4/6] jena git commit: JENA-1011 : Make finish idempotent based on
closedByProducer.
Posted by an...@apache.org.
JENA-1011 : Make finish idempotent based on closedByProducer.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/503bdcfd
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/503bdcfd
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/503bdcfd
Branch: refs/heads/master
Commit: 503bdcfdff3c46b3887434ae658e213f6bf1b982
Parents: c08f31d
Author: Andy Seaborne <an...@apache.org>
Authored: Thu Aug 20 19:11:55 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Thu Aug 20 19:17:56 2015 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/jena/riot/lang/PipedRDFIterator.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/503bdcfd/jena-arq/src/main/java/org/apache/jena/riot/lang/PipedRDFIterator.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/lang/PipedRDFIterator.java b/jena-arq/src/main/java/org/apache/jena/riot/lang/PipedRDFIterator.java
index 68395af..3259b9d 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/lang/PipedRDFIterator.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/lang/PipedRDFIterator.java
@@ -374,6 +374,8 @@ public class PipedRDFIterator<T> implements Iterator<T>, Closeable {
* and error out.
*/
protected void finish() {
+ if ( closedByProducer )
+ return ;
receive(endMarker);
closedByProducer = true;
}
[2/6] jena git commit: Use RDFDataMgr.parse
Posted by an...@apache.org.
Use RDFDataMgr.parse
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/f98247d3
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/f98247d3
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/f98247d3
Branch: refs/heads/master
Commit: f98247d3d6e912d04912a10dbb56fb75bc65db1f
Parents: 0ad3036
Author: Andy Seaborne <an...@apache.org>
Authored: Thu Aug 20 18:36:05 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Thu Aug 20 18:36:05 2015 +0100
----------------------------------------------------------------------
jena-arq/src/main/java/org/apache/jena/riot/RiotReader.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/f98247d3/jena-arq/src/main/java/org/apache/jena/riot/RiotReader.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/RiotReader.java b/jena-arq/src/main/java/org/apache/jena/riot/RiotReader.java
index 315ed75..11b1c11 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/RiotReader.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/RiotReader.java
@@ -216,7 +216,7 @@ public class RiotReader
public void run()
{
out.start();
- parse(input, lang, baseIRI, out);
+ RDFDataMgr.parse(out, input, baseIRI, lang);
out.finish() ;
}
});
@@ -252,7 +252,7 @@ public class RiotReader
public void run()
{
out.start();
- parse(input, lang, baseIRI, out);
+ RDFDataMgr.parse(out, input, baseIRI, lang);
out.finish() ;
}
});
[6/6] jena git commit: JENA-1011: clean up by calling .finish.
Posted by an...@apache.org.
JENA-1011: clean up by calling .finish.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/4237973d
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/4237973d
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/4237973d
Branch: refs/heads/master
Commit: 4237973df8cd9c31912f3fce4fccb71365d0787c
Parents: 7bd750c
Author: Andy Seaborne <an...@apache.org>
Authored: Thu Aug 20 19:14:16 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Thu Aug 20 19:18:15 2015 +0100
----------------------------------------------------------------------
.../java/org/apache/jena/riot/lang/TestPipedRDFIterators.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/4237973d/jena-arq/src/test/java/org/apache/jena/riot/lang/TestPipedRDFIterators.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/riot/lang/TestPipedRDFIterators.java b/jena-arq/src/test/java/org/apache/jena/riot/lang/TestPipedRDFIterators.java
index 1fcb228..3b6e4e5 100644
--- a/jena-arq/src/test/java/org/apache/jena/riot/lang/TestPipedRDFIterators.java
+++ b/jena-arq/src/test/java/org/apache/jena/riot/lang/TestPipedRDFIterators.java
@@ -480,7 +480,6 @@ public class TestPipedRDFIterators {
/**
* Tests attempting to access the iterator after the producer dies
*/
- @Test(expected = RiotException.class)
public void streamed_state_bad_02() {
final PipedRDFIterator<Triple> it = new PipedRDFIterator<>();
@@ -493,6 +492,7 @@ public class TestPipedRDFIterators {
out.triple(Triple.create(org.apache.jena.graph.NodeFactory.createURI("urn:s"),
org.apache.jena.graph.NodeFactory.createURI("urn:p"),
org.apache.jena.graph.NodeFactory.createURI("urn:o")));
+ out.finish() ;
throw new RuntimeException("die!");
}
});
@@ -510,9 +510,9 @@ public class TestPipedRDFIterators {
Assert.assertTrue(it.hasNext());
it.next();
-
- // Should throw a RiotException
+ // Should not throw a RiotException
it.hasNext();
+
}
/**
[3/6] jena git commit: JENA-1011: Add StreamRDF start/finish.
Posted by an...@apache.org.
JENA-1011: Add StreamRDF start/finish.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/c08f31d6
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/c08f31d6
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/c08f31d6
Branch: refs/heads/master
Commit: c08f31d666ede682e6a0d93e9fb0ba001c25276b
Parents: f98247d
Author: Andy Seaborne <an...@apache.org>
Authored: Thu Aug 20 19:08:25 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Thu Aug 20 19:17:07 2015 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/jena/riot/lang/JsonLDReader.java | 2 ++
.../src/main/java/org/apache/jena/riot/lang/ReaderTriX.java | 5 ++---
2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/c08f31d6/jena-arq/src/main/java/org/apache/jena/riot/lang/JsonLDReader.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/lang/JsonLDReader.java b/jena-arq/src/main/java/org/apache/jena/riot/lang/JsonLDReader.java
index e7b758e..4c85264 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/lang/JsonLDReader.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/lang/JsonLDReader.java
@@ -82,6 +82,7 @@ public class JsonLDReader implements ReaderRIOT
}
private void read$(Object jsonObject, String baseURI, ContentType ct, final StreamRDF output, Context context) {
+ output.start() ;
try {
JsonLdTripleCallback callback = new JsonLdTripleCallback() {
@Override
@@ -129,6 +130,7 @@ public class JsonLDReader implements ReaderRIOT
errorHandler.error(e.getMessage(), -1, -1);
throw new RiotException(e) ;
}
+ output.finish() ;
}
private LabelToNode labels = SyntaxLabels.createLabelToNode() ;
http://git-wip-us.apache.org/repos/asf/jena/blob/c08f31d6/jena-arq/src/main/java/org/apache/jena/riot/lang/ReaderTriX.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/lang/ReaderTriX.java b/jena-arq/src/main/java/org/apache/jena/riot/lang/ReaderTriX.java
index 208a53a..8637e35 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/lang/ReaderTriX.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/lang/ReaderTriX.java
@@ -72,8 +72,6 @@ public class ReaderTriX implements ReaderRIOT {
<!ATTLIST typedLiteral datatype CDATA #REQUIRED>
*/
-
-
private ErrorHandler errorHandler = ErrorHandlerFactory.getDefaultErrorHandler() ;
private ParserProfile parserProfile = null ;
@@ -114,7 +112,7 @@ public class ReaderTriX implements ReaderRIOT {
State state = OUTER ;
Node g = null ;
List<Node> terms = new ArrayList<>() ;
-
+ output.start() ;
try {
while(parser.hasNext()) {
int event = parser.next() ;
@@ -228,6 +226,7 @@ public class ReaderTriX implements ReaderRIOT {
} catch (XMLStreamException ex) {
staxError(parser.getLocation(), "XML error: "+ex.getMessage()) ;
}
+ output.finish() ;
}
private void add(Collection<Node> acc, Node node, int max, XMLStreamReader parser) {