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 19:29:30 UTC
[1/2] jena git commit: NodeUtils convert: set and list versions.
Deprecate old name.
Repository: jena
Updated Branches:
refs/heads/master 0cb4374e4 -> e030a60f2
NodeUtils convert: set and list versions. Deprecate old name.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/58209edb
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/58209edb
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/58209edb
Branch: refs/heads/master
Commit: 58209edb5c61acaa35640220b059932fec204dfd
Parents: 0cb4374
Author: Andy Seaborne <an...@apache.org>
Authored: Mon Aug 20 14:34:09 2018 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Mon Aug 20 14:44:31 2018 +0100
----------------------------------------------------------------------
.../jena/sparql/core/DynamicDatasets.java | 10 +++---
.../org/apache/jena/sparql/util/NodeUtils.java | 33 +++++++++++++++-----
.../org/apache/jena/atlas/lib/SetUtils.java | 7 +++++
3 files changed, 39 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/58209edb/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 8b319c3..d394dfb 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
@@ -18,7 +18,10 @@
package org.apache.jena.sparql.core;
-import java.util.Collection ;
+import static org.apache.jena.sparql.util.NodeUtils.convertToSetNodes;
+
+import java.util.Collection;
+import java.util.Set;
import org.apache.jena.graph.Graph ;
import org.apache.jena.graph.Node ;
@@ -27,7 +30,6 @@ import org.apache.jena.query.DatasetFactory ;
import org.apache.jena.sparql.ARQConstants ;
import org.apache.jena.sparql.graph.GraphOps ;
import org.apache.jena.sparql.graph.GraphUnionRead ;
-import org.apache.jena.sparql.util.NodeUtils ;
public class DynamicDatasets
{
@@ -55,8 +57,8 @@ public class DynamicDatasets
if (description.isEmpty() )
return dsg;
- Collection<Node> defaultGraphs = NodeUtils.convertToNodes(description.getDefaultGraphURIs()) ;
- Collection<Node> namedGraphs = NodeUtils.convertToNodes(description.getNamedGraphURIs()) ;
+ Set<Node> defaultGraphs = convertToSetNodes(description.getDefaultGraphURIs()) ;
+ Set<Node> namedGraphs = convertToSetNodes(description.getNamedGraphURIs()) ;
return dynamicDataset(defaultGraphs, namedGraphs, dsg, defaultUnionGraph) ;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/58209edb/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 a505c8f..cb277b1 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
@@ -23,8 +23,10 @@ import java.util.Collection;
import java.util.Iterator;
import java.util.List;
import java.util.Objects;
+import java.util.Set;
import org.apache.jena.atlas.lib.ListUtils;
+import org.apache.jena.atlas.lib.SetUtils;
import org.apache.jena.atlas.lib.StrUtils ;
import org.apache.jena.datatypes.RDFDatatype ;
import org.apache.jena.datatypes.xsd.XSDDatatype ;
@@ -107,22 +109,39 @@ public class NodeUtils
return conv ;
}
- /** 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(
+
+ /** @deprecated Use {@link #convertToSetNodes} */
+ @Deprecated
+ public static Set<Node> convertToNodes(Collection<String> namedGraphs) {
+ return convertToSetNodes(namedGraphs);
+ }
+
+ /** Convert a collection of strings to a set of {@link Node Nodes}. */
+ public static Set<Node> convertToSetNodes(Collection<String> namedGraphs) {
+ Set<Node> nodes = SetUtils.toSet(
namedGraphs.stream().map(NodeFactory::createURI)
);
return nodes;
}
- /** Convert strings to a collection of {@link Node Nodes}. */
- public static Collection<Node> convertToNodes(String... namedGraphs) {
+ /** Convert a collection of strings to a set of {@link Node Nodes}. */
+ public static Set<Node> convertToSetNodes(String... namedGraphs) {
+ return convertToSetNodes(Arrays.asList(namedGraphs));
+ }
+
+ /** Convert strings to a List of {@link Node Nodes}. */
+ public static List<Node> convertToListNodes(String... namedGraphs) {
+ return convertToListNodes(Arrays.asList(namedGraphs));
+ }
+
+ /** Convert strings to a List of {@link Node Nodes}. */
+ public static List<Node> convertToListNodes(List<String> namedGraphs) {
List<Node> nodes = ListUtils.toList(
- Arrays.stream(namedGraphs).map(NodeFactory::createURI)
+ namedGraphs.stream().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 ) {
http://git-wip-us.apache.org/repos/asf/jena/blob/58209edb/jena-base/src/main/java/org/apache/jena/atlas/lib/SetUtils.java
----------------------------------------------------------------------
diff --git a/jena-base/src/main/java/org/apache/jena/atlas/lib/SetUtils.java b/jena-base/src/main/java/org/apache/jena/atlas/lib/SetUtils.java
index 719775b..e0f01ba 100644
--- a/jena-base/src/main/java/org/apache/jena/atlas/lib/SetUtils.java
+++ b/jena-base/src/main/java/org/apache/jena/atlas/lib/SetUtils.java
@@ -21,6 +21,8 @@ package org.apache.jena.atlas.lib;
import java.util.HashSet ;
import java.util.Set ;
import java.util.concurrent.ConcurrentHashMap ;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
/** Set specific operations */
public class SetUtils
@@ -87,5 +89,10 @@ public class SetUtils
s3.removeAll(s2) ;
return s3 ;
}
+
+ /** Stream to set */
+ public static <T> Set<T> toSet(Stream<T> stream) {
+ return stream.collect(Collectors.toSet());
+ }
}
[2/2] jena git commit: Merge commit 'refs/pull/464/head' of
https://github.com/apache/jena
Posted by an...@apache.org.
Merge commit 'refs/pull/464/head' of https://github.com/apache/jena
This closes #464.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/e030a60f
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/e030a60f
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/e030a60f
Branch: refs/heads/master
Commit: e030a60f2d033f6857b7aeeeaaffc03ec7058606
Parents: 0cb4374 58209ed
Author: Andy Seaborne <an...@apache.org>
Authored: Mon Aug 20 20:28:53 2018 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Mon Aug 20 20:28:53 2018 +0100
----------------------------------------------------------------------
.../jena/sparql/core/DynamicDatasets.java | 10 +++---
.../org/apache/jena/sparql/util/NodeUtils.java | 33 +++++++++++++++-----
.../org/apache/jena/atlas/lib/SetUtils.java | 7 +++++
3 files changed, 39 insertions(+), 11 deletions(-)
----------------------------------------------------------------------