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 2018/08/20 07:39:07 UTC
[08/19] jena git commit: Strings to Node_URIs.
Strings to Node_URIs.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/cb6d9b5c
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/cb6d9b5c
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/cb6d9b5c
Branch: refs/heads/master
Commit: cb6d9b5c63e0cfcb5bb600c4e5af9948c77b41ec
Parents: caf572a
Author: Andy Seaborne <an...@apache.org>
Authored: Thu Aug 16 09:56:48 2018 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Thu Aug 16 09:56:48 2018 +0100
----------------------------------------------------------------------
.../jena/sparql/core/DynamicDatasets.java | 5 ++--
.../org/apache/jena/sparql/util/NodeUtils.java | 29 ++++++++++++--------
2 files changed, 19 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/cb6d9b5c/jena-arq/src/main/java/org/apache/jena/sparql/core/DynamicDatasets.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/core/DynamicDatasets.java b/jena-arq/src/main/java/org/apache/jena/sparql/core/DynamicDatasets.java
index a13769b..8b319c3 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/core/DynamicDatasets.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/core/DynamicDatasets.java
@@ -19,7 +19,6 @@
package org.apache.jena.sparql.core;
import java.util.Collection ;
-import java.util.Set ;
import org.apache.jena.graph.Graph ;
import org.apache.jena.graph.Node ;
@@ -56,8 +55,8 @@ public class DynamicDatasets
if (description.isEmpty() )
return dsg;
- Set<Node> defaultGraphs = NodeUtils.convertToNodes(description.getDefaultGraphURIs()) ;
- Set<Node> namedGraphs = NodeUtils.convertToNodes(description.getNamedGraphURIs()) ;
+ Collection<Node> defaultGraphs = NodeUtils.convertToNodes(description.getDefaultGraphURIs()) ;
+ Collection<Node> namedGraphs = NodeUtils.convertToNodes(description.getNamedGraphURIs()) ;
return dynamicDataset(defaultGraphs, namedGraphs, dsg, defaultUnionGraph) ;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/cb6d9b5c/jena-arq/src/main/java/org/apache/jena/sparql/util/NodeUtils.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/util/NodeUtils.java b/jena-arq/src/main/java/org/apache/jena/sparql/util/NodeUtils.java
index 978cda1..5dd1d6f 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/util/NodeUtils.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/util/NodeUtils.java
@@ -18,12 +18,9 @@
package org.apache.jena.sparql.util;
-import java.util.Collection ;
-import java.util.HashSet ;
-import java.util.Iterator ;
-import java.util.Objects;
-import java.util.Set ;
+import java.util.*;
+import org.apache.jena.atlas.lib.ListUtils;
import org.apache.jena.atlas.lib.StrUtils ;
import org.apache.jena.datatypes.RDFDatatype ;
import org.apache.jena.datatypes.xsd.XSDDatatype ;
@@ -105,15 +102,23 @@ public class NodeUtils
Iterator<String> conv = new MapFilterIterator<>(mapper, eIter) ;
return conv ;
}
-
- /** Convert IRI String to Node */
- public static Set<Node> convertToNodes(Collection<String> uris) {
- Set<Node> nodes = new HashSet<>() ;
- for ( String x : uris )
- nodes.add(NodeFactory.createURI(x)) ;
- return nodes ;
+
+ /** Convert a collection of strings to a collection of {@link Node Nodes}. */
+ public static Collection<Node> convertToNodes(Collection<String> namedGraphs) {
+ List<Node> nodes = ListUtils.toList(
+ namedGraphs.stream().map(NodeFactory::createURI)
+ );
+ return nodes;
}
+ /** Convert strings to a collection of {@link Node Nodes}. */
+ public static Collection<Node> convertToNodes(String... namedGraphs) {
+ List<Node> nodes = ListUtils.toList(
+ Arrays.stream(namedGraphs).map(NodeFactory::createURI)
+ );
+ return nodes;
+ }
+
/** Compare two Nodes, based on their RDF terms forms, not value */
public static int compareRDFTerms(Node node1, Node node2) {
if ( node1 == null ) {