Use streams

Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/763b3209
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/763b3209
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/763b3209

Branch: refs/heads/master
Commit: 763b3209771c448d3ce5acac004b41f92f197422
Parents: 1c804f6
Author: Andy Seaborne <a...@apache.org>
Authored: Tue Sep 13 14:46:15 2016 +0100
Committer: Andy Seaborne <a...@apache.org>
Committed: Tue Sep 13 14:46:15 2016 +0100

----------------------------------------------------------------------
 .../main/java/org/apache/jena/riot/system/StreamOps.java    | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/763b3209/jena-arq/src/main/java/org/apache/jena/riot/system/StreamOps.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/system/StreamOps.java 
b/jena-arq/src/main/java/org/apache/jena/riot/system/StreamOps.java
index 185ce8b..6a19229 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/system/StreamOps.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/system/StreamOps.java
@@ -19,7 +19,6 @@
 package org.apache.jena.riot.system;
 
 import java.util.Iterator ;
-import java.util.Map.Entry ;
 
 import org.apache.jena.graph.Graph ;
 import org.apache.jena.graph.Triple ;
@@ -58,13 +57,11 @@ public class StreamOps {
 
     /** Send a PrefixMap to a stream */
     public static void sendPrefixesToStream(PrefixMap prefixMap, StreamRDF 
stream) {
-        for ( Entry<String, String> e : 
prefixMap.getMappingCopyStr().entrySet())
-            stream.prefix(e.getKey(), e.getValue()) ;
+        prefixMap.forEach((p,u) -> stream.prefix(p, u.toString())) ;
     }
     
     public static void sendPrefixesToStream(PrefixMapping prefixMap, StreamRDF 
stream) {
-        for ( Entry<String, String> e : prefixMap.getNsPrefixMap().entrySet() )
-            stream.prefix(e.getKey(), e.getValue()) ;
+        prefixMap.getNsPrefixMap().forEach(stream::prefix);
     }
 
     /** Send a dataset graph to a stream with triples for the default graph
@@ -109,7 +106,7 @@ public class StreamOps {
     /** Send the triples of graph and an explicitly given prefix mapping, to a 
StreamRDF */
     public static void sendGraphToStream(Graph graph, StreamRDF stream, 
PrefixMap prefixMap) {
         if ( prefixMap != null )
-            sendPrefixesToStream(graph.getPrefixMapping(), stream) ;
+            sendPrefixesToStream(prefixMap, stream) ;
         Iterator<Triple> iter = graph.find(null, null, null) ;
         StreamOps.sendTriplesToStream(iter, stream) ;
     }

Reply via email to