Fix native parsing from Java InputStream (#114)

We checked if more bytes are available in the InputStream using .available()... which absolutely not how Java byte streams work, I have no idea how I made this mistake. Anyway, the proto lib checks this for us, so we can also simplify the code a bit.
Jelly-RDF · Jul 14, 2024 · 543be31 · 543be31
1 parent 832268b
commit 543be31
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 19 deletions.
diff --git a/jena/src/main/scala/eu/ostrzyciel/jelly/convert/jena/riot/JellyReader.scala b/jena/src/main/scala/eu/ostrzyciel/jelly/convert/jena/riot/JellyReader.scala
@@ -31,16 +31,16 @@ object JellyReader extends ReaderRIOT:
     val decoder = JenaConverterFactory.anyStatementDecoder(Some(supportedOptions))
     output.start()
     try {
-      while in.available() > 0 do
-        val frame = RdfStreamFrame.parseDelimitedFrom(in)
-        frame match
-          case Some(f) =>
-            for row <- f.rows do
-              decoder.ingestRow(row) match
-                case Some(st: Triple) => output.triple(st)
-                case Some(st: Quad) => output.quad(st)
-                case None => ()
-          case None => ()
+      Iterator.continually(RdfStreamFrame.parseDelimitedFrom(in))
+        .takeWhile(_.isDefined)
+        .foreach { maybeFrame =>
+          val frame = maybeFrame.get
+          for row <- frame.rows do
+            decoder.ingestRow(row) match
+              case Some(st: Triple) => output.triple(st)
+              case Some(st: Quad) => output.quad(st)
+              case None => ()
+        }
     }
     finally {
       output.finish()

diff --git a/rdf4j/src/main/scala/eu/ostrzyciel/jelly/convert/rdf4j/rio/JellyParser.scala b/rdf4j/src/main/scala/eu/ostrzyciel/jelly/convert/rdf4j/rio/JellyParser.scala
@@ -38,15 +38,15 @@ final class JellyParser extends AbstractRDFParser:
 
     rdfHandler.startRDF()
     try {
-      while in.available() > 0 do
-        val frame = RdfStreamFrame.parseDelimitedFrom(in)
-        frame match
-          case Some(f) =>
-            for row <- f.rows do
-              decoder.ingestRow(row) match
-                case Some(st) => rdfHandler.handleStatement(st)
-                case None => ()
-          case None => ()
+      Iterator.continually(RdfStreamFrame.parseDelimitedFrom(in))
+        .takeWhile(_.isDefined)
+        .foreach { maybeFrame =>
+          val frame = maybeFrame.get
+          for row <- frame.rows do
+            decoder.ingestRow(row) match
+              case Some(st) => rdfHandler.handleStatement(st)
+              case None => ()
+        }
     }
     finally {
       rdfHandler.endRDF()