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/07/14 15:44:26 UTC
[1/8] jena git commit: JENA-987: add a typed constructor,
deprecate the (Object) form.
Repository: jena
Updated Branches:
refs/heads/master 843f54c48 -> 5799250b4
JENA-987: add a typed constructor, deprecate the (Object) form.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/fc598a94
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/fc598a94
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/fc598a94
Branch: refs/heads/master
Commit: fc598a94df42e273dbedafdec205b19cf00f5e6b
Parents: 80dbb45
Author: Andy Seaborne <an...@apache.org>
Authored: Mon Jul 13 11:36:19 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Mon Jul 13 11:36:19 2015 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/jena/graph/Node_Blank.java | 12 ++++++++----
.../main/java/org/apache/jena/graph/Node_Literal.java | 5 +++++
.../src/main/java/org/apache/jena/graph/Node_URI.java | 5 +++++
.../main/java/org/apache/jena/graph/Node_Variable.java | 1 +
4 files changed, 19 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/fc598a94/jena-core/src/main/java/org/apache/jena/graph/Node_Blank.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/graph/Node_Blank.java b/jena-core/src/main/java/org/apache/jena/graph/Node_Blank.java
index 69d3e80..d1db8e2 100644
--- a/jena-core/src/main/java/org/apache/jena/graph/Node_Blank.java
+++ b/jena-core/src/main/java/org/apache/jena/graph/Node_Blank.java
@@ -18,25 +18,29 @@
package org.apache.jena.graph;
-import org.apache.jena.rdf.model.* ;
+
/**
RDF blank nodes, ie nodes with identity but without URIs.
*/
public class Node_Blank extends Node_Concrete
- {
+ {
+ /** @deprecated Use {@link Node_Blank#BlankNodeId} */
+ @Deprecated
/* package */ Node_Blank( Object id ) { super( id ); }
+ /* package */ Node_Blank( BlankNodeId id ) { super( id ); }
+
@Override
public boolean isBlank() { return true; }
@Override
- public AnonId getBlankNodeId() { return (AnonId) label; }
+ public BlankNodeId getBlankNodeId() { return (BlankNodeId) label; }
@Override
public Object visitWith( NodeVisitor v )
- { return v.visitBlank( this, (AnonId) label ); }
+ { return v.visitBlank( this, (BlankNodeId) label ); }
@Override
public boolean equals( Object other )
http://git-wip-us.apache.org/repos/asf/jena/blob/fc598a94/jena-core/src/main/java/org/apache/jena/graph/Node_Literal.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/graph/Node_Literal.java b/jena-core/src/main/java/org/apache/jena/graph/Node_Literal.java
index d2e72a2..476ffb3 100644
--- a/jena-core/src/main/java/org/apache/jena/graph/Node_Literal.java
+++ b/jena-core/src/main/java/org/apache/jena/graph/Node_Literal.java
@@ -27,9 +27,14 @@ import org.apache.jena.shared.* ;
*/
public class Node_Literal extends Node_Concrete
{
+ /** @deprecated Use {@code Node_Literal(LiteralLabel)} */
+ @Deprecated
/* package */ Node_Literal( Object label )
{ super( label ); }
+ /* package */ Node_Literal( LiteralLabel label )
+ { super( label ); }
+
@Override
public LiteralLabel getLiteral()
{ return (LiteralLabel) label; }
http://git-wip-us.apache.org/repos/asf/jena/blob/fc598a94/jena-core/src/main/java/org/apache/jena/graph/Node_URI.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/graph/Node_URI.java b/jena-core/src/main/java/org/apache/jena/graph/Node_URI.java
index 331a383..3db28bc 100644
--- a/jena-core/src/main/java/org/apache/jena/graph/Node_URI.java
+++ b/jena-core/src/main/java/org/apache/jena/graph/Node_URI.java
@@ -26,9 +26,14 @@ import org.apache.jena.shared.* ;
*/
public class Node_URI extends Node_Concrete
{
+ /** @deprecated Use {@code Node_URI(String)} */
+ @Deprecated
protected Node_URI( Object uri )
{ super( uri ); }
+ protected Node_URI( String uri )
+ { super( uri ); }
+
@Override
public String getURI()
{ return (String) label; }
http://git-wip-us.apache.org/repos/asf/jena/blob/fc598a94/jena-core/src/main/java/org/apache/jena/graph/Node_Variable.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/graph/Node_Variable.java b/jena-core/src/main/java/org/apache/jena/graph/Node_Variable.java
index 50d2491..aa10279 100644
--- a/jena-core/src/main/java/org/apache/jena/graph/Node_Variable.java
+++ b/jena-core/src/main/java/org/apache/jena/graph/Node_Variable.java
@@ -30,6 +30,7 @@ public class Node_Variable extends Node_Fluid
Initialise this Node_Variable with a name object (which should be a
VariableName object).
*/
+ @Deprecated
protected Node_Variable( Object name )
{ super( name ); }
[2/8] jena git commit: JENA-986: BlankNodeId - graph-level bnode
system identifier.
Posted by an...@apache.org.
JENA-986: BlankNodeId - graph-level bnode system identifier.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/da0ccfe3
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/da0ccfe3
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/da0ccfe3
Branch: refs/heads/master
Commit: da0ccfe394c3b92accc6fc35b2fe8eef32a964b0
Parents: fc598a9
Author: Andy Seaborne <an...@apache.org>
Authored: Mon Jul 13 11:37:23 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Mon Jul 13 11:37:23 2015 +0100
----------------------------------------------------------------------
.../java/org/apache/jena/graph/BlankNodeId.java | 156 +++++++++++++++++++
1 file changed, 156 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/da0ccfe3/jena-core/src/main/java/org/apache/jena/graph/BlankNodeId.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/graph/BlankNodeId.java b/jena-core/src/main/java/org/apache/jena/graph/BlankNodeId.java
new file mode 100644
index 0000000..08a340c
--- /dev/null
+++ b/jena-core/src/main/java/org/apache/jena/graph/BlankNodeId.java
@@ -0,0 +1,156 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jena.graph;
+
+import java.rmi.server.UID;
+import java.util.concurrent.atomic.AtomicInteger ;
+
+import org.apache.jena.rdf.model.AnonId ;
+import org.apache.jena.shared.impl.JenaParameters ;
+
+/** System identifier for a blank node.
+ *
+ * Blank nodes have identity (you can .equals them apart)
+ * but no external stable identifier like a URI.
+ * <p>
+ * Databases need a persistent identifier for blank nodes - BlankNodeId.
+ * <p>
+ * The equivalent concept for the API is {@link AnonId}.
+ * Historically, that has been in the org.apache.jena.rdf.model
+ * package.
+ *
+ *
+ * <p>This id is guaranteed to be unique on this machine.</p>
+ */
+
+public class BlankNodeId extends java.lang.Object {
+
+ // Support for running in environments, like Google App Engine, where
+ // java.rmi.server.UID is not available
+ // Will be obsoleted by improved AnonId handling
+ static boolean UIDok = true;
+ static {
+ try { new UID() ; }
+ catch (Throwable ex) { UIDok = false ; }
+ }
+
+ protected String id = null;
+
+ /**
+ * Support for debugging: global BlankNodeId counter. The intial value is
+ * just to make the output look prettier if it has lots (but not lots and
+ * lots) of bnodes in it.
+ */
+ private static AtomicInteger idCount = new AtomicInteger(100000) ;
+
+ public static BlankNodeId create()
+ { return new BlankNodeId(); }
+
+ public static BlankNodeId create( String id )
+ { return new BlankNodeId( id ); }
+
+ /**
+ * Creates new BlankNodeId. Normally this id is guaranteed to be unique on
+ * this machine: it is time-dependant. However, sometimes [incorrect] code
+ * is sensitive to bnode ordering and produces bizarre bugs. Hence the
+ * disableBNodeUIDGeneration flag, which allows bnode IDs to be predictable.
+ */
+ protected BlankNodeId() {
+ if (JenaParameters.disableBNodeUIDGeneration)
+ id = "A" + idCount.getAndIncrement();
+ else if (!UIDok)
+ id = java.util.UUID.randomUUID().toString();
+ else
+ id = (new UID()).toString();
+ }
+
+
+ /** Create a new BlankNodeId from the string argument supplied.
+ * @param id A string representation of the id to be created.
+ */
+ public BlankNodeId( String id ) {
+ this.id = id;
+ }
+
+ protected BlankNodeId( BlankNodeId id ) {
+ this.id = id.getLabelString();
+ }
+
+
+ //@Override
+ public int hashCode1() {
+ final int prime = 31 ;
+ int result = 1 ;
+ result = prime * result + ((id == null) ? 0 : id.hashCode()) ;
+ return result ;
+ }
+
+ /** return a hashcode for this id
+ * @return the hash code
+ */
+ @Override
+ public int hashCode() {
+ return id.hashCode();
+ }
+
+ /**
+ * Test whether two id's are the same
+ *
+ * @param other the object to be compared
+ * @return true if and only if the two id's are the same
+ */
+ @Override
+ public boolean equals( Object other ) {
+ return other instanceof BlankNodeId && id.equals( ((BlankNodeId) other).id );
+ }
+
+ //@Override
+ public boolean equals1(Object obj) {
+ if ( this == obj )
+ return true ;
+ if ( obj == null )
+ return false ;
+ if ( !(obj instanceof BlankNodeId) )
+ return false ;
+ BlankNodeId other = (BlankNodeId)obj ;
+ if ( id == null ) {
+ if ( other.id != null )
+ return false ;
+ } else if ( !id.equals(other.id) )
+ return false ;
+ return true ;
+ }
+
+
+ /** return a string representation of the id
+ * @return a string representation of the id
+ */
+ @Override
+ public String toString() {
+ return id;
+ }
+
+ /**
+ * Answer the label string of this BlankNodeId. To be used in preference to
+ * {@code toString}
+ */
+ public String getLabelString() {
+ return id;
+ }
+}
[3/8] jena git commit: JENA-986: Replace AnonId with BlankNodeId for
graph-level usage.
Posted by an...@apache.org.
JENA-986: Replace AnonId with BlankNodeId for graph-level usage.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/20ab2e2e
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/20ab2e2e
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/20ab2e2e
Branch: refs/heads/master
Commit: 20ab2e2e5926a5c9714a0e294a21042f2f200bbe
Parents: da0ccfe
Author: Andy Seaborne <an...@apache.org>
Authored: Mon Jul 13 11:38:18 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Mon Jul 13 11:38:18 2015 +0100
----------------------------------------------------------------------
.../main/java/org/apache/jena/graph/Node.java | 34 ++++++++------
.../java/org/apache/jena/graph/NodeFactory.java | 49 ++++++++++++++++----
.../java/org/apache/jena/graph/NodeVisitor.java | 5 +-
3 files changed, 62 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/20ab2e2e/jena-core/src/main/java/org/apache/jena/graph/Node.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/graph/Node.java b/jena-core/src/main/java/org/apache/jena/graph/Node.java
index 023e78a..f44a308 100644
--- a/jena-core/src/main/java/org/apache/jena/graph/Node.java
+++ b/jena-core/src/main/java/org/apache/jena/graph/Node.java
@@ -20,7 +20,6 @@ package org.apache.jena.graph;
import org.apache.jena.datatypes.RDFDatatype ;
import org.apache.jena.graph.impl.LiteralLabel ;
-import org.apache.jena.rdf.model.AnonId ;
import org.apache.jena.shared.JenaException ;
import org.apache.jena.shared.PrefixMapping ;
@@ -83,7 +82,7 @@ public abstract class Node {
{ return false; }
/** get the blank node id if the node is blank, otherwise die horribly */
- public AnonId getBlankNodeId()
+ public BlankNodeId getBlankNodeId()
{ throw new UnsupportedOperationException( this + " is not a blank node" ); }
/**
@@ -176,24 +175,29 @@ public abstract class Node {
public boolean hasURI( String uri )
{ return false; }
+ // DEPRECATED
/** an abstraction to allow code sharing */
static abstract class NodeMaker { abstract Node construct( Object x ); }
- static final NodeMaker makeAnon = new NodeMaker()
- { @Override
- Node construct( Object x ) { return new Node_Blank( x ); } };
+ @Deprecated
+ static final NodeMaker makeAnon = new NodeMaker() {
+ @Override Node construct( Object x ) { return new Node_Blank( x ); }
+ };
- static final NodeMaker makeLiteral = new NodeMaker()
- { @Override
- Node construct( Object x ) { return new Node_Literal( x ); } };
+ @Deprecated
+ static final NodeMaker makeLiteral = new NodeMaker() {
+ @Override Node construct( Object x ) { return new Node_Literal( x ); }
+ };
- static final NodeMaker makeURI = new NodeMaker()
- { @Override
- Node construct( Object x ) { return new Node_URI( x ); } };
+ @Deprecated
+ static final NodeMaker makeURI = new NodeMaker() {
+ @Override Node construct( Object x ) { return new Node_URI( x ); }
+ };
- static final NodeMaker makeVariable = new NodeMaker()
- { @Override
- Node construct( Object x ) { return new Node_Variable( x ); } };
+ @Deprecated
+ static final NodeMaker makeVariable = new NodeMaker() {
+ @Override Node construct( Object x ) { return new Node_Variable( x ); }
+ };
/**
The canonical NULL. It appears here so that revised definitions [eg as a bnode]
@@ -208,7 +212,9 @@ public abstract class Node {
/**
We object strongly to null labels: for example, they make .equals flaky.
+ @deprecated Use specific {@link NodeFactory} functions.
*/
+ @Deprecated
public static Node create( NodeMaker maker, Object label )
{
if (label == null) throw new JenaException( "Node.make: null label" );
http://git-wip-us.apache.org/repos/asf/jena/blob/20ab2e2e/jena-core/src/main/java/org/apache/jena/graph/NodeFactory.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/graph/NodeFactory.java b/jena-core/src/main/java/org/apache/jena/graph/NodeFactory.java
index 3f9951a..d127bb9 100644
--- a/jena-core/src/main/java/org/apache/jena/graph/NodeFactory.java
+++ b/jena-core/src/main/java/org/apache/jena/graph/NodeFactory.java
@@ -23,7 +23,6 @@ import org.apache.jena.datatypes.RDFDatatype ;
import org.apache.jena.datatypes.TypeMapper ;
import org.apache.jena.graph.impl.LiteralLabel ;
import org.apache.jena.graph.impl.LiteralLabelFactory ;
-import org.apache.jena.rdf.model.AnonId ;
public class NodeFactory {
@@ -31,29 +30,61 @@ public class NodeFactory {
return TypeMapper.getInstance().getSafeTypeByName(s) ;
}
- /** make a blank node with a fresh anon id */
- public static Node createAnon() {
- return createAnon(AnonId.create()) ;
+ /** Make a fresh blank node */
+ public static Node createBlankNode() {
+ return createBlankNode(BlankNodeId.create()) ;
+ }
+
+ /** make a blank node with the specified label
+ */
+ public static Node createBlankNode(BlankNodeId id) {
+ return new Node_Blank(id) ;
}
/** make a blank node with the specified label */
- public static Node createAnon(AnonId id) {
- return Node.create(Node.makeAnon, id) ;
+ public static Node createBlankNode(String string) {
+ BlankNodeId id = BlankNodeId.create(string) ;
+ return new Node_Blank(id) ;
+ }
+
+ /** make a blank node with a fresh anon id
+ * @deprecated Use {@link #createBlankNode()}
+ */
+ @Deprecated
+ public static Node createAnon() {
+ return createAnon(BlankNodeId.create()) ;
+ }
+
+ /** make a blank node with the specified label
+ * @deprecated Use {@link #createBlankNode(BlankNodeId)}
+ */
+ @Deprecated
+ public static Node createAnon(BlankNodeId id) {
+ return new Node_Blank(id) ;
+ }
+
+ /** make a blank node with the specified label
+ * @deprecated Use {@link #createBlankNode(String)}
+ */
+ @Deprecated
+ public static Node createAnon(String string) {
+ BlankNodeId id = BlankNodeId.create(string) ;
+ return new Node_Blank(id) ;
}
/** make a literal node with the specified literal value */
public static Node createLiteral(LiteralLabel lit) {
- return Node.create(Node.makeLiteral, lit) ;
+ return new Node_Literal( lit ) ;
}
/** make a URI node with the specified URIref string */
public static Node createURI(String uri) {
- return Node.create(Node.makeURI, uri) ;
+ return new Node_URI(uri) ;
}
/** make a variable node with a given name */
public static Node createVariable(String name) {
- return Node.create(Node.makeVariable, Node_Variable.variable(name)) ;
+ return new Node_Variable(name) ;
}
public static Node createLiteral(String value) {
http://git-wip-us.apache.org/repos/asf/jena/blob/20ab2e2e/jena-core/src/main/java/org/apache/jena/graph/NodeVisitor.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/graph/NodeVisitor.java b/jena-core/src/main/java/org/apache/jena/graph/NodeVisitor.java
index b733c2c..2ad0a51 100644
--- a/jena-core/src/main/java/org/apache/jena/graph/NodeVisitor.java
+++ b/jena-core/src/main/java/org/apache/jena/graph/NodeVisitor.java
@@ -18,8 +18,7 @@
package org.apache.jena.graph;
-import org.apache.jena.graph.impl.* ;
-import org.apache.jena.rdf.model.* ;
+import org.apache.jena.graph.impl.LiteralLabel ;
/**
The NodeVisitor interface is used by Node::visitWith so that an application
@@ -28,7 +27,7 @@ import org.apache.jena.rdf.model.* ;
public interface NodeVisitor
{
Object visitAny( Node_ANY it );
- Object visitBlank( Node_Blank it, AnonId id );
+ Object visitBlank( Node_Blank it, BlankNodeId id );
Object visitLiteral( Node_Literal it, LiteralLabel lit );
Object visitURI( Node_URI it, String uri );
Object visitVariable( Node_Variable it, String name );
[6/8] jena git commit: Changes for AnonId/BlankNodeId and
createAnon->createBlankNode.
Posted by an...@apache.org.
Changes for AnonId/BlankNodeId and createAnon->createBlankNode.
JENA-986
JENA-987
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/64e23ff5
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/64e23ff5
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/64e23ff5
Branch: refs/heads/master
Commit: 64e23ff59d14cc6b4bd990d474ea9454f6516609
Parents: ebabda7
Author: Andy Seaborne <an...@apache.org>
Authored: Mon Jul 13 11:40:20 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Mon Jul 13 11:40:20 2015 +0100
----------------------------------------------------------------------
.../jena/riot/checker/CheckerVisitor.java | 3 +-
.../jena/riot/lang/BlankNodeAllocatorHash.java | 3 +-
.../jena/riot/lang/BlankNodeAllocatorLabel.java | 3 +-
.../lang/BlankNodeAllocatorLabelEncoded.java | 5 +--
.../lang/BlankNodeAllocatorTraditional.java | 2 +-
.../java/org/apache/jena/riot/lang/LangCSV.java | 2 +-
.../org/apache/jena/riot/lang/LangRDFXML.java | 2 +-
.../apache/jena/riot/lang/LangTurtleBase.java | 2 +-
.../org/apache/jena/riot/system/RiotLib.java | 3 +-
.../apache/jena/riot/thrift/ThriftConvert.java | 3 +-
.../java/org/apache/jena/riot/tokens/Token.java | 27 +++---------
.../engine/binding/BindingInputStream.java | 3 +-
.../org/apache/jena/sparql/expr/E_BNode.java | 2 +-
.../org/apache/jena/sparql/expr/NodeValue.java | 29 ++----------
.../apache/jena/sparql/modify/TemplateLib.java | 2 +-
.../sparql/resultset/JSONInputIterator.java | 28 +++++-------
.../jena/sparql/resultset/XMLInputStAX.java | 3 +-
.../jena/sparql/sse/lang/ParseHandlerPlain.java | 2 +-
.../apache/jena/sparql/util/LabelToNodeMap.java | 2 +-
.../jena/sparql/util/graph/GraphList.java | 4 +-
.../jena/atlas/data/TestDistinctDataBag.java | 6 +--
.../jena/atlas/data/TestDistinctDataNet.java | 6 +--
.../jena/atlas/data/TestSortedDataBag.java | 6 +--
.../jena/riot/lang/TestCollectorStream.java | 4 +-
.../apache/jena/riot/lang/TestNodeToLabel.java | 6 +--
.../jena/riot/lang/TestPipedRDFIterators.java | 4 +-
.../apache/jena/riot/thrift/TestThriftTerm.java | 5 +--
.../jena/riot/tokens/TestTokenForNode.java | 3 +-
.../apache/jena/riot/writer/TestRDFJSON.java | 2 +-
.../sparql/core/AbstractDatasetGraphTests.java | 6 +--
.../engine/binding/TestBindingStreams.java | 3 +-
.../engine/iterator/TestQueryIterSort.java | 6 +--
.../jena/sparql/expr/TestExpressions.java | 2 +-
.../jena/sparql/expr/TestNodeFunctions.java | 6 +--
.../apache/jena/sparql/expr/TestOrdering.java | 2 +-
.../apache/jena/sparql/expr/TestXSDFuncOp.java | 8 ++--
.../sparql/modify/AbstractTestUpdateGraph.java | 8 ++--
.../apache/jena/sparql/util/TestFmtUtils.java | 8 ++--
.../apache/jena/n3/turtle/LabelToNodeMap.java | 2 +-
.../org/apache/jena/n3/turtle/ParserBase.java | 3 +-
.../apache/jena/rdf/model/impl/ModelCom.java | 4 +-
.../apache/jena/rdf/model/impl/ReifierStd.java | 2 +-
.../jena/rdf/model/impl/ResourceImpl.java | 13 +++---
.../apache/jena/rdfxml/xmlinput/JenaReader.java | 2 +-
.../jena/reasoner/rulesys/FBRuleInfGraph.java | 2 +-
.../org/apache/jena/reasoner/rulesys/Rule.java | 19 +++-----
.../org/apache/jena/reasoner/rulesys/Util.java | 2 +-
.../reasoner/rulesys/builtins/MakeSkolem.java | 10 ++---
.../reasoner/rulesys/builtins/MakeTemp.java | 2 +-
.../reasoner/rulesys/impl/BindingStack.java | 6 +--
.../reasoner/rulesys/impl/BindingVector.java | 6 +--
.../rulesys/impl/LPBindingEnvironment.java | 6 +--
.../reasoner/rulesys/impl/TempNodeCache.java | 2 +-
.../apache/jena/enhanced/test/TestPackage.java | 2 +-
.../jena/graph/test/AbstractTestReifier.java | 2 +-
.../apache/jena/graph/test/NodeCreateUtils.java | 4 +-
.../org/apache/jena/graph/test/TestNode.java | 46 ++++++++++----------
.../org/apache/jena/graph/test/TestTriple.java | 7 +--
.../jena/rdfxml/xmloutput/TestXMLFeatures.java | 2 +-
.../jena/reasoner/rulesys/test/TestBugs.java | 4 +-
.../jena/reasoner/rulesys/test/TestFBRules.java | 2 +-
.../jena/testing_framework/NodeCreateUtils.java | 20 ++++-----
.../jena/testing_framework/TestFileData.java | 36 ++++++---------
.../permissions/example/ExampleEvaluator.java | 22 ++++------
.../example/ShiroExampleEvaluator.java | 26 +++++------
.../model/impl/SecuredResourceImpl.java | 2 +-
.../model/SecuredModelDetailTest.java | 21 +++++----
.../apache/jena/sdb/layout1/CodecSimple.java | 4 +-
.../org/apache/jena/sdb/layout2/SQLBridge2.java | 13 +++---
.../jena/query/spatial/SpatialQueryFuncs.java | 3 +-
.../jena/tdb/store/nodetable/NodecLib.java | 3 +-
.../jena/tdb/store/nodetable/NodecSSE.java | 3 +-
.../jena/tdb/store/nodetable/TestCodec.java | 9 ++--
.../apache/jena/query/text/TextQueryFuncs.java | 5 +--
.../org/apache/jena/query/text/TextQueryPF.java | 5 +--
75 files changed, 224 insertions(+), 319 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/64e23ff5/jena-arq/src/main/java/org/apache/jena/riot/checker/CheckerVisitor.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/checker/CheckerVisitor.java b/jena-arq/src/main/java/org/apache/jena/riot/checker/CheckerVisitor.java
index c754479..42f9a89 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/checker/CheckerVisitor.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/checker/CheckerVisitor.java
@@ -20,7 +20,6 @@ package org.apache.jena.riot.checker;
import org.apache.jena.graph.* ;
import org.apache.jena.graph.impl.LiteralLabel ;
-import org.apache.jena.rdf.model.AnonId ;
public class CheckerVisitor implements NodeVisitor
{
@@ -31,7 +30,7 @@ public class CheckerVisitor implements NodeVisitor
}
@Override
- public Object visitBlank(Node_Blank it, AnonId id)
+ public Object visitBlank(Node_Blank it, BlankNodeId id)
{
return null ;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/64e23ff5/jena-arq/src/main/java/org/apache/jena/riot/lang/BlankNodeAllocatorHash.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/lang/BlankNodeAllocatorHash.java b/jena-arq/src/main/java/org/apache/jena/riot/lang/BlankNodeAllocatorHash.java
index 594082e..4a9e06b 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/lang/BlankNodeAllocatorHash.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/lang/BlankNodeAllocatorHash.java
@@ -29,7 +29,6 @@ import org.apache.jena.atlas.lib.CacheFactory ;
import org.apache.jena.atlas.lib.InternalErrorException ;
import org.apache.jena.graph.Node ;
import org.apache.jena.graph.NodeFactory ;
-import org.apache.jena.rdf.model.AnonId ;
/**
* Allocate bnode labels using a per-run seed and the label presented.
@@ -126,6 +125,6 @@ public class BlankNodeAllocatorHash implements BlankNodeAllocator {
mDigest.update(labelBytes) ;
byte[] bytes = mDigest.digest() ; // resets
String hexString = Bytes.asHexLC(bytes) ;
- return NodeFactory.createAnon(new AnonId(hexString)) ;
+ return NodeFactory.createBlankNode(hexString) ;
}
}
http://git-wip-us.apache.org/repos/asf/jena/blob/64e23ff5/jena-arq/src/main/java/org/apache/jena/riot/lang/BlankNodeAllocatorLabel.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/lang/BlankNodeAllocatorLabel.java b/jena-arq/src/main/java/org/apache/jena/riot/lang/BlankNodeAllocatorLabel.java
index cf8fa43..648a02a 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/lang/BlankNodeAllocatorLabel.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/lang/BlankNodeAllocatorLabel.java
@@ -22,7 +22,6 @@ import java.util.concurrent.atomic.AtomicLong ;
import org.apache.jena.graph.Node ;
import org.apache.jena.graph.NodeFactory ;
-import org.apache.jena.rdf.model.AnonId ;
import org.apache.jena.riot.out.NodeToLabel ;
/** Allocate blank nodes according to the label given.
@@ -53,6 +52,6 @@ public class BlankNodeAllocatorLabel implements BlankNodeAllocator
}
private Node create(String label) {
- return NodeFactory.createAnon(new AnonId(label)) ;
+ return NodeFactory.createBlankNode(label) ;
}
}
http://git-wip-us.apache.org/repos/asf/jena/blob/64e23ff5/jena-arq/src/main/java/org/apache/jena/riot/lang/BlankNodeAllocatorLabelEncoded.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/lang/BlankNodeAllocatorLabelEncoded.java b/jena-arq/src/main/java/org/apache/jena/riot/lang/BlankNodeAllocatorLabelEncoded.java
index bc11a5d..42220d0 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/lang/BlankNodeAllocatorLabelEncoded.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/lang/BlankNodeAllocatorLabelEncoded.java
@@ -22,7 +22,6 @@ import java.util.concurrent.atomic.AtomicLong ;
import org.apache.jena.graph.Node ;
import org.apache.jena.graph.NodeFactory ;
-import org.apache.jena.rdf.model.AnonId ;
import org.apache.jena.riot.SysRIOT ;
import org.apache.jena.riot.out.NodeFmtLib ;
import org.apache.jena.riot.out.NodeToLabel ;
@@ -43,12 +42,12 @@ public class BlankNodeAllocatorLabelEncoded implements BlankNodeAllocator {
@Override
public Node alloc(String label) {
- return NodeFactory.createAnon(new AnonId(NodeFmtLib.decodeBNodeLabel(label))) ;
+ return NodeFactory.createBlankNode(NodeFmtLib.decodeBNodeLabel(label)) ;
}
@Override
public Node create() {
String label = SysRIOT.BNodeGenIdPrefix + (counter.getAndIncrement()) ;
- return NodeFactory.createAnon(new AnonId(label)) ;
+ return NodeFactory.createBlankNode(label) ;
}
}
http://git-wip-us.apache.org/repos/asf/jena/blob/64e23ff5/jena-arq/src/main/java/org/apache/jena/riot/lang/BlankNodeAllocatorTraditional.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/lang/BlankNodeAllocatorTraditional.java b/jena-arq/src/main/java/org/apache/jena/riot/lang/BlankNodeAllocatorTraditional.java
index aba402b..ee1380f 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/lang/BlankNodeAllocatorTraditional.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/lang/BlankNodeAllocatorTraditional.java
@@ -54,6 +54,6 @@ public class BlankNodeAllocatorTraditional implements BlankNodeAllocator
@Override
public Node create()
{
- return NodeFactory.createAnon() ;
+ return NodeFactory.createBlankNode() ;
}
}
http://git-wip-us.apache.org/repos/asf/jena/blob/64e23ff5/jena-arq/src/main/java/org/apache/jena/riot/lang/LangCSV.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/lang/LangCSV.java b/jena-arq/src/main/java/org/apache/jena/riot/lang/LangCSV.java
index da1f4a1..db1cf03 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/lang/LangCSV.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/lang/LangCSV.java
@@ -144,7 +144,7 @@ public class LangCSV implements LangRIOT {
}
public static Node caculateSubject(int rowNum, String filename){
- Node subject = NodeFactory.createAnon();
+ Node subject = NodeFactory.createBlankNode();
// String uri = IRIResolver.resolveString(filename) + "#Row_" + rowNum;
// Node subject = NodeFactory.createURI(uri);
return subject;
http://git-wip-us.apache.org/repos/asf/jena/blob/64e23ff5/jena-arq/src/main/java/org/apache/jena/riot/lang/LangRDFXML.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/lang/LangRDFXML.java b/jena-arq/src/main/java/org/apache/jena/riot/lang/LangRDFXML.java
index 5e563a2..24b8bca 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/lang/LangRDFXML.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/lang/LangRDFXML.java
@@ -195,7 +195,7 @@ public class LangRDFXML implements LangRIOT
// String id = r.getAnonymousID();
Node rr = (Node) r.getUserData();
if (rr == null) {
- rr = NodeFactory.createAnon();
+ rr = NodeFactory.createBlankNode();
r.setUserData(rr);
}
return rr;
http://git-wip-us.apache.org/repos/asf/jena/blob/64e23ff5/jena-arq/src/main/java/org/apache/jena/riot/lang/LangTurtleBase.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/lang/LangTurtleBase.java b/jena-arq/src/main/java/org/apache/jena/riot/lang/LangTurtleBase.java
index 9c1a913..90d1bc1 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/lang/LangTurtleBase.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/lang/LangTurtleBase.java
@@ -451,7 +451,7 @@ public abstract class LangTurtleBase extends LangBase {
exception(errorToken, "Malformed list") ;
// Node for the list structre.
- Node nextCell = NodeFactory.createAnon() ;
+ Node nextCell = NodeFactory.createBlankNode() ;
if ( listHead == null )
listHead = nextCell ;
if ( lastCell != null )
http://git-wip-us.apache.org/repos/asf/jena/blob/64e23ff5/jena-arq/src/main/java/org/apache/jena/riot/system/RiotLib.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/system/RiotLib.java b/jena-arq/src/main/java/org/apache/jena/riot/system/RiotLib.java
index c85d9dd..54fe37f 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/system/RiotLib.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/system/RiotLib.java
@@ -38,7 +38,6 @@ import org.apache.jena.graph.Node ;
import org.apache.jena.graph.NodeFactory ;
import org.apache.jena.graph.Triple ;
import org.apache.jena.query.ARQ ;
-import org.apache.jena.rdf.model.AnonId ;
import org.apache.jena.riot.Lang ;
import org.apache.jena.riot.RDFLanguages ;
import org.apache.jena.riot.SysRIOT ;
@@ -71,7 +70,7 @@ public class RiotLib
if ( isBNodeIRI(iri) )
{
String s = iri.substring(bNodeLabelStart.length()) ;
- Node n = NodeFactory.createAnon(new AnonId(s)) ;
+ Node n = NodeFactory.createBlankNode(s) ;
return n ;
}
return NodeFactory.createURI(iri) ;
http://git-wip-us.apache.org/repos/asf/jena/blob/64e23ff5/jena-arq/src/main/java/org/apache/jena/riot/thrift/ThriftConvert.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/thrift/ThriftConvert.java b/jena-arq/src/main/java/org/apache/jena/riot/thrift/ThriftConvert.java
index 454e0a6..879c3f1 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/thrift/ThriftConvert.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/thrift/ThriftConvert.java
@@ -31,7 +31,6 @@ import org.apache.jena.datatypes.xsd.impl.RDFLangString ;
import org.apache.jena.graph.Node ;
import org.apache.jena.graph.NodeFactory ;
import org.apache.jena.graph.Triple ;
-import org.apache.jena.rdf.model.AnonId ;
import org.apache.jena.riot.system.PrefixMap ;
import org.apache.jena.riot.system.PrefixMapFactory ;
import org.apache.jena.riot.thrift.wire.* ;
@@ -66,7 +65,7 @@ public class ThriftConvert
return NodeFactory.createURI(term.getIri().getIri()) ;
if ( term.isSetBnode() )
- return NodeFactory.createAnon(new AnonId(term.getBnode().getLabel())) ;
+ return NodeFactory.createBlankNode(term.getBnode().getLabel()) ;
if ( term.isSetLiteral() ) {
RDF_Literal lit = term.getLiteral() ;
http://git-wip-us.apache.org/repos/asf/jena/blob/64e23ff5/jena-arq/src/main/java/org/apache/jena/riot/tokens/Token.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/tokens/Token.java b/jena-arq/src/main/java/org/apache/jena/riot/tokens/Token.java
index 7046545..0b3b5dd 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/tokens/Token.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/tokens/Token.java
@@ -18,29 +18,13 @@
package org.apache.jena.riot.tokens;
-import static org.apache.jena.atlas.lib.Chars.CH_COMMA ;
-import static org.apache.jena.atlas.lib.Chars.CH_DOT ;
-import static org.apache.jena.atlas.lib.Chars.CH_LBRACE ;
-import static org.apache.jena.atlas.lib.Chars.CH_LBRACKET ;
-import static org.apache.jena.atlas.lib.Chars.CH_LPAREN ;
-import static org.apache.jena.atlas.lib.Chars.CH_RBRACE ;
-import static org.apache.jena.atlas.lib.Chars.CH_RBRACKET ;
-import static org.apache.jena.atlas.lib.Chars.CH_RPAREN ;
-import static org.apache.jena.atlas.lib.Chars.CH_SEMICOLON ;
+import static org.apache.jena.atlas.lib.Chars.* ;
import static org.apache.jena.atlas.lib.Lib.hashCodeObject ;
-import static org.apache.jena.riot.tokens.TokenType.BNODE ;
-import static org.apache.jena.riot.tokens.TokenType.DECIMAL ;
-import static org.apache.jena.riot.tokens.TokenType.DOUBLE ;
-import static org.apache.jena.riot.tokens.TokenType.INTEGER ;
-import static org.apache.jena.riot.tokens.TokenType.IRI ;
-import static org.apache.jena.riot.tokens.TokenType.LITERAL_DT ;
-import static org.apache.jena.riot.tokens.TokenType.LITERAL_LANG ;
-import static org.apache.jena.riot.tokens.TokenType.STRING ;
-import static org.apache.jena.riot.tokens.TokenType.VAR ;
+import static org.apache.jena.riot.tokens.TokenType.* ;
import java.util.ArrayList ;
import java.util.List ;
-import java.util.Objects;
+import java.util.Objects ;
import org.apache.jena.atlas.io.PeekReader ;
import org.apache.jena.atlas.iterator.Iter ;
@@ -50,9 +34,8 @@ import org.apache.jena.datatypes.TypeMapper ;
import org.apache.jena.datatypes.xsd.XSDDatatype ;
import org.apache.jena.graph.Node ;
import org.apache.jena.graph.NodeFactory ;
-import org.apache.jena.rdf.model.AnonId ;
import org.apache.jena.riot.RiotException ;
-import org.apache.jena.riot.system.PrefixMap;
+import org.apache.jena.riot.system.PrefixMap ;
import org.apache.jena.riot.system.Prologue ;
import org.apache.jena.sparql.core.Var ;
import org.apache.jena.sparql.graph.NodeConst ;
@@ -428,7 +411,7 @@ public final class Token
switch(tokenType)
{
// Assumes that bnode labels have been sorted out already.
- case BNODE : return NodeFactory.createAnon(new AnonId(tokenImage)) ;
+ case BNODE : return NodeFactory.createBlankNode(tokenImage) ;
case IRI :
// RiotLib.createIRIorBNode(tokenImage) includes processing <_:label>
return NodeFactory.createURI(tokenImage) ;
http://git-wip-us.apache.org/repos/asf/jena/blob/64e23ff5/jena-arq/src/main/java/org/apache/jena/sparql/engine/binding/BindingInputStream.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/binding/BindingInputStream.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/binding/BindingInputStream.java
index 3a750a0..786f6f7 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/binding/BindingInputStream.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/binding/BindingInputStream.java
@@ -33,7 +33,6 @@ import org.apache.jena.atlas.lib.Closeable ;
import org.apache.jena.graph.Node ;
import org.apache.jena.graph.NodeFactory ;
import org.apache.jena.iri.IRI ;
-import org.apache.jena.rdf.model.AnonId ;
import org.apache.jena.riot.lang.LabelToNode ;
import org.apache.jena.riot.lang.LangEngine ;
import org.apache.jena.riot.out.NodeFmtLib ;
@@ -172,7 +171,7 @@ public class BindingInputStream extends LangEngine implements Iterator<Binding>,
if ( token.hasType(TokenType.STAR ) || ( token.isCtlCode() && token.getCntrlCode() == -1 ) )
n = lastLine.get(v) ;
else if ( token.hasType(TokenType.BNODE) )
- n = NodeFactory.createAnon(new AnonId(NodeFmtLib.decodeBNodeLabel(token.getImage()))) ;
+ n = NodeFactory.createBlankNode(NodeFmtLib.decodeBNodeLabel(token.getImage())) ;
else
n = profile.create(null, token) ;
binding.add(v, n) ;
http://git-wip-us.apache.org/repos/asf/jena/blob/64e23ff5/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_BNode.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_BNode.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_BNode.java
index e132a7a..162a812 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_BNode.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/E_BNode.java
@@ -54,7 +54,7 @@ public class E_BNode extends ExprFunctionN // 0 or one
expr = getArg(1) ;
if ( expr == null )
- return NodeValue.makeNode(NodeFactory.createAnon()) ;
+ return NodeValue.makeNode(NodeFactory.createBlankNode()) ;
NodeValue x = expr.eval(binding, env) ;
if ( ! x.isString() )
http://git-wip-us.apache.org/repos/asf/jena/blob/64e23ff5/jena-arq/src/main/java/org/apache/jena/sparql/expr/NodeValue.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/NodeValue.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/NodeValue.java
index 0394bfd..68ce1ff 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/NodeValue.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/NodeValue.java
@@ -18,29 +18,9 @@
package org.apache.jena.sparql.expr;
-import static javax.xml.datatype.DatatypeConstants.DAYS ;
-import static javax.xml.datatype.DatatypeConstants.HOURS ;
-import static javax.xml.datatype.DatatypeConstants.MINUTES ;
-import static javax.xml.datatype.DatatypeConstants.MONTHS ;
-import static javax.xml.datatype.DatatypeConstants.SECONDS ;
-import static javax.xml.datatype.DatatypeConstants.YEARS ;
+import static javax.xml.datatype.DatatypeConstants.* ;
import static org.apache.jena.datatypes.xsd.XSDDatatype.* ;
-import static org.apache.jena.sparql.expr.ValueSpaceClassification.VSPACE_BOOLEAN ;
-import static org.apache.jena.sparql.expr.ValueSpaceClassification.VSPACE_DATE ;
-import static org.apache.jena.sparql.expr.ValueSpaceClassification.VSPACE_DATETIME ;
-import static org.apache.jena.sparql.expr.ValueSpaceClassification.VSPACE_DIFFERENT ;
-import static org.apache.jena.sparql.expr.ValueSpaceClassification.VSPACE_DURATION ;
-import static org.apache.jena.sparql.expr.ValueSpaceClassification.VSPACE_G_DAY ;
-import static org.apache.jena.sparql.expr.ValueSpaceClassification.VSPACE_G_MONTH ;
-import static org.apache.jena.sparql.expr.ValueSpaceClassification.VSPACE_G_MONTHDAY ;
-import static org.apache.jena.sparql.expr.ValueSpaceClassification.VSPACE_G_YEAR ;
-import static org.apache.jena.sparql.expr.ValueSpaceClassification.VSPACE_G_YEARMONTH ;
-import static org.apache.jena.sparql.expr.ValueSpaceClassification.VSPACE_LANG ;
-import static org.apache.jena.sparql.expr.ValueSpaceClassification.VSPACE_NODE ;
-import static org.apache.jena.sparql.expr.ValueSpaceClassification.VSPACE_NUM ;
-import static org.apache.jena.sparql.expr.ValueSpaceClassification.VSPACE_STRING ;
-import static org.apache.jena.sparql.expr.ValueSpaceClassification.VSPACE_TIME ;
-import static org.apache.jena.sparql.expr.ValueSpaceClassification.VSPACE_UNKNOWN ;
+import static org.apache.jena.sparql.expr.ValueSpaceClassification.* ;
import java.io.File ;
import java.io.FileInputStream ;
@@ -67,7 +47,6 @@ import org.apache.jena.datatypes.xsd.XSDDateTime ;
import org.apache.jena.graph.Node ;
import org.apache.jena.graph.NodeFactory ;
import org.apache.jena.graph.impl.LiteralLabel ;
-import org.apache.jena.rdf.model.AnonId ;
import org.apache.jena.sparql.ARQInternalErrorException ;
import org.apache.jena.sparql.SystemARQ ;
import org.apache.jena.sparql.engine.ExecutionContext ;
@@ -75,7 +54,7 @@ import org.apache.jena.sparql.engine.binding.Binding ;
import org.apache.jena.sparql.expr.nodevalue.* ;
import org.apache.jena.sparql.function.FunctionEnv ;
import org.apache.jena.sparql.graph.NodeConst ;
-import org.apache.jena.sparql.graph.NodeTransform;
+import org.apache.jena.sparql.graph.NodeTransform ;
import org.apache.jena.sparql.serializer.SerializationContext ;
import org.apache.jena.sparql.util.* ;
import org.apache.jena.vocabulary.RDF ;
@@ -155,7 +134,7 @@ public abstract class NodeValue extends ExprNode
// Use "==" for equality.
private static final String strForUnNode = "node value nothing" ;
- public static final NodeValue nvNothing = NodeValue.makeNode(org.apache.jena.graph.NodeFactory.createAnon(new AnonId("node value nothing"))) ;
+ public static final NodeValue nvNothing = NodeValue.makeNode(NodeFactory.createBlankNode("node value nothing")) ;
public static final String xsdNamespace = XSD+"#" ;
http://git-wip-us.apache.org/repos/asf/jena/blob/64e23ff5/jena-arq/src/main/java/org/apache/jena/sparql/modify/TemplateLib.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/modify/TemplateLib.java b/jena-arq/src/main/java/org/apache/jena/sparql/modify/TemplateLib.java
index 63b5cb4..39f46b4 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/modify/TemplateLib.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/modify/TemplateLib.java
@@ -186,7 +186,7 @@ public class TemplateLib
private static Node newBlank(Node n, Map<Node, Node> bNodeMap)
{
if ( ! bNodeMap.containsKey(n) )
- bNodeMap.put(n, NodeFactory.createAnon() );
+ bNodeMap.put(n, NodeFactory.createBlankNode() );
return bNodeMap.get(n) ;
}
}
http://git-wip-us.apache.org/repos/asf/jena/blob/64e23ff5/jena-arq/src/main/java/org/apache/jena/sparql/resultset/JSONInputIterator.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/resultset/JSONInputIterator.java b/jena-arq/src/main/java/org/apache/jena/sparql/resultset/JSONInputIterator.java
index 2d47846..9b85f9e 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/resultset/JSONInputIterator.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/resultset/JSONInputIterator.java
@@ -18,28 +18,22 @@
package org.apache.jena.sparql.resultset;
-import java.io.InputStream;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.NoSuchElementException;
-import java.util.Queue;
-import java.util.Set;
+import java.io.InputStream ;
+import java.util.* ;
-import org.apache.jena.atlas.AtlasException;
-import org.apache.jena.atlas.io.IO;
-import org.apache.jena.atlas.io.IndentedWriter;
-import org.apache.jena.atlas.io.PeekReader;
-import org.apache.jena.atlas.iterator.PeekIterator;
-import org.apache.jena.atlas.json.io.parser.TokenizerJSON;
+import org.apache.jena.atlas.AtlasException ;
+import org.apache.jena.atlas.io.IO ;
+import org.apache.jena.atlas.io.IndentedWriter ;
+import org.apache.jena.atlas.io.PeekReader ;
+import org.apache.jena.atlas.iterator.PeekIterator ;
+import org.apache.jena.atlas.json.io.parser.TokenizerJSON ;
import org.apache.jena.datatypes.TypeMapper ;
import org.apache.jena.graph.Node ;
import org.apache.jena.graph.NodeFactory ;
import org.apache.jena.query.QueryException ;
-import org.apache.jena.rdf.model.AnonId ;
-import org.apache.jena.riot.tokens.Token;
-import org.apache.jena.riot.tokens.TokenType;
import org.apache.jena.riot.RiotParseException ;
+import org.apache.jena.riot.tokens.Token ;
+import org.apache.jena.riot.tokens.TokenType ;
import org.apache.jena.sparql.core.Var ;
import org.apache.jena.sparql.engine.binding.Binding ;
import org.apache.jena.sparql.engine.binding.BindingFactory ;
@@ -552,7 +546,7 @@ public class JSONInputIterator extends QueryIteratorBase {
return NodeFactory.createLiteral(value);
}
} else if (type.equals("bnode")) {
- return NodeFactory.createAnon(new AnonId(value));
+ return NodeFactory.createBlankNode(value);
} else {
exception(pos, "Encountered a Node object with an invalid type value '%s', expected one of uri, literal or bnode", type);
}
http://git-wip-us.apache.org/repos/asf/jena/blob/64e23ff5/jena-arq/src/main/java/org/apache/jena/sparql/resultset/XMLInputStAX.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/resultset/XMLInputStAX.java b/jena-arq/src/main/java/org/apache/jena/sparql/resultset/XMLInputStAX.java
index 0fae9ac..e194730 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/resultset/XMLInputStAX.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/resultset/XMLInputStAX.java
@@ -41,7 +41,6 @@ import org.apache.jena.graph.NodeFactory ;
import org.apache.jena.query.ARQ ;
import org.apache.jena.query.QuerySolution ;
import org.apache.jena.query.ResultSet ;
-import org.apache.jena.rdf.model.AnonId ;
import org.apache.jena.rdf.model.Model ;
import org.apache.jena.sparql.ARQConstants ;
import org.apache.jena.sparql.core.ResultBinding ;
@@ -449,7 +448,7 @@ class XMLInputStAX extends SPARQLResult {
Node node = null ;
// if ( inputGraphLabels.getValue() )
if ( inputGraphLabels )
- node = NodeFactory.createAnon(new AnonId(label)) ;
+ node = NodeFactory.createBlankNode(label) ;
else
node = bNodes.asNode(label) ;
addBinding(binding, Var.alloc(varName), node) ;
http://git-wip-us.apache.org/repos/asf/jena/blob/64e23ff5/jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/ParseHandlerPlain.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/ParseHandlerPlain.java b/jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/ParseHandlerPlain.java
index fc02cec..4badbfa 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/ParseHandlerPlain.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/ParseHandlerPlain.java
@@ -161,7 +161,7 @@ public class ParseHandlerPlain implements ParseHandler
Node n = null ;
if ( label.equals("") )
// Fresh anonymous bNode
- n = NodeFactory.createAnon() ;
+ n = NodeFactory.createBlankNode() ;
else
n = bNodeLabels.asNode(label) ;
Item item = Item.createNode(n, line, column) ;
http://git-wip-us.apache.org/repos/asf/jena/blob/64e23ff5/jena-arq/src/main/java/org/apache/jena/sparql/util/LabelToNodeMap.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/util/LabelToNodeMap.java b/jena-arq/src/main/java/org/apache/jena/sparql/util/LabelToNodeMap.java
index 1584f38..ce85262 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/util/LabelToNodeMap.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/util/LabelToNodeMap.java
@@ -82,7 +82,7 @@ public class LabelToNodeMap
{
if ( generateVars )
return allocAnonVariable() ;
- return NodeFactory.createAnon() ;
+ return NodeFactory.createBlankNode() ;
}
private Node allocAnonVariable()
http://git-wip-us.apache.org/repos/asf/jena/blob/64e23ff5/jena-arq/src/main/java/org/apache/jena/sparql/util/graph/GraphList.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/util/graph/GraphList.java b/jena-arq/src/main/java/org/apache/jena/sparql/util/graph/GraphList.java
index fbc01b4..1e85716 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/util/graph/GraphList.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/util/graph/GraphList.java
@@ -321,12 +321,12 @@ public class GraphList
if ( list.size() == 0 )
return RDF.Nodes.nil ;
- Node head = NodeFactory.createAnon() ;
+ Node head = NodeFactory.createBlankNode() ;
Node n = head ;
for ( Node elt : list )
{
// Cell:
- Node consCell = NodeFactory.createAnon() ;
+ Node consCell = NodeFactory.createBlankNode() ;
// Last cell to this one.
Triple t = new Triple(n, RDF.Nodes.rest, consCell) ;
Triple t1 = new Triple(consCell, RDF.Nodes.first, elt) ;
http://git-wip-us.apache.org/repos/asf/jena/blob/64e23ff5/jena-arq/src/test/java/org/apache/jena/atlas/data/TestDistinctDataBag.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/atlas/data/TestDistinctDataBag.java b/jena-arq/src/test/java/org/apache/jena/atlas/data/TestDistinctDataBag.java
index ef7d4ff..cd38359 100644
--- a/jena-arq/src/test/java/org/apache/jena/atlas/data/TestDistinctDataBag.java
+++ b/jena-arq/src/test/java/org/apache/jena/atlas/data/TestDistinctDataBag.java
@@ -164,16 +164,16 @@ public class TestDistinctDataBag extends TestCase
private Binding randomBinding(Var[] vars)
{
BindingMap binding = BindingFactory.create();
- binding.add(vars[0], NodeFactory.createAnon());
+ binding.add(vars[0], NodeFactory.createBlankNode());
binding.add(vars[1], NodeFactory.createURI(randomURI()));
binding.add(vars[2], NodeFactory.createURI(randomURI()));
binding.add(vars[3], NodeFactory.createLiteral(randomString(20)));
- binding.add(vars[4], NodeFactory.createAnon());
+ binding.add(vars[4], NodeFactory.createBlankNode());
binding.add(vars[5], NodeFactory.createURI(randomURI()));
binding.add(vars[6], NodeFactory.createURI(randomURI()));
binding.add(vars[7], NodeFactory.createLiteral(randomString(5)));
binding.add(vars[8], NodeFactory.createLiteral("" + random.nextInt(), XSDDatatype.XSDinteger));
- binding.add(vars[9], NodeFactory.createAnon());
+ binding.add(vars[9], NodeFactory.createBlankNode());
return binding;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/64e23ff5/jena-arq/src/test/java/org/apache/jena/atlas/data/TestDistinctDataNet.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/atlas/data/TestDistinctDataNet.java b/jena-arq/src/test/java/org/apache/jena/atlas/data/TestDistinctDataNet.java
index c835f9a..af2e9d9 100644
--- a/jena-arq/src/test/java/org/apache/jena/atlas/data/TestDistinctDataNet.java
+++ b/jena-arq/src/test/java/org/apache/jena/atlas/data/TestDistinctDataNet.java
@@ -268,16 +268,16 @@ public class TestDistinctDataNet extends TestCase
private Binding randomBinding(Var[] vars)
{
BindingMap binding = BindingFactory.create();
- binding.add(vars[0], NodeFactory.createAnon());
+ binding.add(vars[0], NodeFactory.createBlankNode());
binding.add(vars[1], NodeFactory.createURI(randomURI()));
binding.add(vars[2], NodeFactory.createURI(randomURI()));
binding.add(vars[3], NodeFactory.createLiteral(randomString(20)));
- binding.add(vars[4], NodeFactory.createAnon());
+ binding.add(vars[4], NodeFactory.createBlankNode());
binding.add(vars[5], NodeFactory.createURI(randomURI()));
binding.add(vars[6], NodeFactory.createURI(randomURI()));
binding.add(vars[7], NodeFactory.createLiteral(randomString(5)));
binding.add(vars[8], NodeFactory.createLiteral("" + random.nextInt(), XSDDatatype.XSDinteger));
- binding.add(vars[9], NodeFactory.createAnon());
+ binding.add(vars[9], NodeFactory.createBlankNode());
return binding;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/64e23ff5/jena-arq/src/test/java/org/apache/jena/atlas/data/TestSortedDataBag.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/atlas/data/TestSortedDataBag.java b/jena-arq/src/test/java/org/apache/jena/atlas/data/TestSortedDataBag.java
index 818cd7a..5c1d879 100644
--- a/jena-arq/src/test/java/org/apache/jena/atlas/data/TestSortedDataBag.java
+++ b/jena-arq/src/test/java/org/apache/jena/atlas/data/TestSortedDataBag.java
@@ -185,16 +185,16 @@ public class TestSortedDataBag extends TestCase
private Binding randomBinding(Var[] vars)
{
BindingMap binding = BindingFactory.create();
- binding.add(vars[0], NodeFactory.createAnon());
+ binding.add(vars[0], NodeFactory.createBlankNode());
binding.add(vars[1], NodeFactory.createURI(randomURI()));
binding.add(vars[2], NodeFactory.createURI(randomURI()));
binding.add(vars[3], NodeFactory.createLiteral(randomString(20)));
- binding.add(vars[4], NodeFactory.createAnon());
+ binding.add(vars[4], NodeFactory.createBlankNode());
binding.add(vars[5], NodeFactory.createURI(randomURI()));
binding.add(vars[6], NodeFactory.createURI(randomURI()));
binding.add(vars[7], NodeFactory.createLiteral(randomString(5)));
binding.add(vars[8], NodeFactory.createLiteral("" + random.nextInt(), XSDDatatype.XSDinteger));
- binding.add(vars[9], NodeFactory.createAnon());
+ binding.add(vars[9], NodeFactory.createBlankNode());
return binding;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/64e23ff5/jena-arq/src/test/java/org/apache/jena/riot/lang/TestCollectorStream.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/riot/lang/TestCollectorStream.java b/jena-arq/src/test/java/org/apache/jena/riot/lang/TestCollectorStream.java
index 031064a..e84c936 100644
--- a/jena-arq/src/test/java/org/apache/jena/riot/lang/TestCollectorStream.java
+++ b/jena-arq/src/test/java/org/apache/jena/riot/lang/TestCollectorStream.java
@@ -35,7 +35,7 @@ public class TestCollectorStream {
List<Triple> results = new ArrayList<>();
out.start();
for (int i = 1; i <= size; i++) {
- Triple t = new Triple(NodeFactory.createAnon(),
+ Triple t = new Triple(NodeFactory.createBlankNode(),
NodeFactory.createURI("http://predicate"), NodeFactoryExtra.intToNode(i));
out.triple(t);
results.add(t);
@@ -57,7 +57,7 @@ public class TestCollectorStream {
out.start();
for (int i = 1; i <= size; i++) {
Quad q = new Quad(NodeFactory.createURI("http://graph"),
- NodeFactory.createAnon(),
+ NodeFactory.createBlankNode(),
NodeFactory.createURI("http://predicate"), NodeFactoryExtra.intToNode(i));
out.quad(q);
results.add(q);
http://git-wip-us.apache.org/repos/asf/jena/blob/64e23ff5/jena-arq/src/test/java/org/apache/jena/riot/lang/TestNodeToLabel.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/riot/lang/TestNodeToLabel.java b/jena-arq/src/test/java/org/apache/jena/riot/lang/TestNodeToLabel.java
index 19a1273..8942f45 100644
--- a/jena-arq/src/test/java/org/apache/jena/riot/lang/TestNodeToLabel.java
+++ b/jena-arq/src/test/java/org/apache/jena/riot/lang/TestNodeToLabel.java
@@ -89,7 +89,7 @@ public class TestNodeToLabel extends BaseTest
@Test public void node2label_02()
{
NodeToLabel mapper = factory.create() ;
- Node x = NodeFactory.createAnon() ;
+ Node x = NodeFactory.createBlankNode() ;
String s1 = mapper.get(null, x) ;
String s2 = mapper.get(null, x) ;
assertNotNull(s1) ;
@@ -100,8 +100,8 @@ public class TestNodeToLabel extends BaseTest
@Test public void node2label_03()
{
NodeToLabel mapper = factory.create() ;
- Node x1 = NodeFactory.createAnon() ;
- Node x2 = NodeFactory.createAnon() ;
+ Node x1 = NodeFactory.createBlankNode() ;
+ Node x2 = NodeFactory.createBlankNode() ;
String s1 = mapper.get(null, x1) ;
String s2 = mapper.get(null, x2) ;
assertNotNull(s1) ;
http://git-wip-us.apache.org/repos/asf/jena/blob/64e23ff5/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 9a37f8b..1fcb228 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
@@ -80,7 +80,7 @@ public class TestPipedRDFIterators {
out.start();
// Generate triples
for (int i = 1; i <= generateSize; i++) {
- Triple t = new Triple(org.apache.jena.graph.NodeFactory.createAnon(),
+ Triple t = new Triple(org.apache.jena.graph.NodeFactory.createBlankNode(),
org.apache.jena.graph.NodeFactory.createURI("http://predicate"), NodeFactoryExtra.intToNode(i));
out.triple(t);
}
@@ -225,7 +225,7 @@ public class TestPipedRDFIterators {
// Generate quads
for (int i = 1; i <= generateSize; i++) {
Quad q = new Quad(org.apache.jena.graph.NodeFactory.createURI("http://graph"),
- org.apache.jena.graph.NodeFactory.createAnon(),
+ org.apache.jena.graph.NodeFactory.createBlankNode(),
org.apache.jena.graph.NodeFactory.createURI("http://predicate"), NodeFactoryExtra.intToNode(i));
out.quad(q);
}
http://git-wip-us.apache.org/repos/asf/jena/blob/64e23ff5/jena-arq/src/test/java/org/apache/jena/riot/thrift/TestThriftTerm.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/riot/thrift/TestThriftTerm.java b/jena-arq/src/test/java/org/apache/jena/riot/thrift/TestThriftTerm.java
index 70ea33e..41e0964 100644
--- a/jena-arq/src/test/java/org/apache/jena/riot/thrift/TestThriftTerm.java
+++ b/jena-arq/src/test/java/org/apache/jena/riot/thrift/TestThriftTerm.java
@@ -22,12 +22,9 @@ import org.apache.jena.JenaRuntime ;
import org.apache.jena.atlas.junit.BaseTest ;
import org.apache.jena.graph.Node ;
import org.apache.jena.graph.NodeFactory ;
-import org.apache.jena.rdf.model.AnonId ;
import org.apache.jena.rdf.model.impl.Util ;
import org.apache.jena.riot.system.PrefixMap ;
import org.apache.jena.riot.system.PrefixMapFactory ;
-import org.apache.jena.riot.thrift.TRDF ;
-import org.apache.jena.riot.thrift.ThriftConvert ;
import org.apache.jena.riot.thrift.wire.RDF_BNode ;
import org.apache.jena.riot.thrift.wire.RDF_IRI ;
import org.apache.jena.riot.thrift.wire.RDF_Literal ;
@@ -124,7 +121,7 @@ public class TestThriftTerm extends BaseTest {
@Test public void term_bnode_02() {
String label = "abcdefghijklmn" ;
- Node n = NodeFactory.createAnon(new AnonId("abcdefghijklmn")) ;
+ Node n = NodeFactory.createBlankNode("abcdefghijklmn") ;
RDF_Term rt = testTerm(n) ;
assertTrue(rt.isSetBnode()) ;
assertEquals("abcdefghijklmn", rt.getBnode().getLabel()) ;
http://git-wip-us.apache.org/repos/asf/jena/blob/64e23ff5/jena-arq/src/test/java/org/apache/jena/riot/tokens/TestTokenForNode.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/riot/tokens/TestTokenForNode.java b/jena-arq/src/test/java/org/apache/jena/riot/tokens/TestTokenForNode.java
index 7ea6e62..45c57d7 100644
--- a/jena-arq/src/test/java/org/apache/jena/riot/tokens/TestTokenForNode.java
+++ b/jena-arq/src/test/java/org/apache/jena/riot/tokens/TestTokenForNode.java
@@ -20,7 +20,6 @@ package org.apache.jena.riot.tokens;
import org.apache.jena.atlas.junit.BaseTest ;
import org.apache.jena.graph.Node ;
-import org.apache.jena.rdf.model.AnonId ;
import org.apache.jena.riot.system.PrefixMap ;
import org.apache.jena.riot.system.PrefixMapFactory ;
import org.apache.jena.sparql.util.NodeFactoryExtra ;
@@ -61,7 +60,7 @@ public class TestTokenForNode extends BaseTest
{ test( "<http://example/bar>", TokenType.PREFIXED_NAME, "ex", "bar", null, null) ; }
@Test public void tokenForNode07()
- { test( org.apache.jena.graph.NodeFactory.createAnon(new AnonId("abc")), TokenType.BNODE, "abc", null, null, null ) ; }
+ { test( org.apache.jena.graph.NodeFactory.createBlankNode("abc"), TokenType.BNODE, "abc", null, null, null ) ; }
@Test public void tokenForNode08()
{ test( Node.ANY, TokenType.KEYWORD, "ANY", null, null, null) ; }
http://git-wip-us.apache.org/repos/asf/jena/blob/64e23ff5/jena-arq/src/test/java/org/apache/jena/riot/writer/TestRDFJSON.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/riot/writer/TestRDFJSON.java b/jena-arq/src/test/java/org/apache/jena/riot/writer/TestRDFJSON.java
index 8e2b065..e13a089 100644
--- a/jena-arq/src/test/java/org/apache/jena/riot/writer/TestRDFJSON.java
+++ b/jena-arq/src/test/java/org/apache/jena/riot/writer/TestRDFJSON.java
@@ -133,7 +133,7 @@ public class TestRDFJSON extends BaseTest
@Test public void rdfjson_escapes()
{
Graph g = GraphFactory.createGraphMem();
- Node s = NodeFactory.createAnon();
+ Node s = NodeFactory.createBlankNode();
Node p = NodeFactory.createURI("http://predicate");
g.add(new Triple(s, p, NodeFactory.createLiteral("quote \" character")));
g.add(new Triple(s, p, NodeFactory.createLiteral("new \n\r lines")));
http://git-wip-us.apache.org/repos/asf/jena/blob/64e23ff5/jena-arq/src/test/java/org/apache/jena/sparql/core/AbstractDatasetGraphTests.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/core/AbstractDatasetGraphTests.java b/jena-arq/src/test/java/org/apache/jena/sparql/core/AbstractDatasetGraphTests.java
index 6364fd4..02fc8fa 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/core/AbstractDatasetGraphTests.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/core/AbstractDatasetGraphTests.java
@@ -233,7 +233,7 @@ public abstract class AbstractDatasetGraphTests
DatasetGraph dsg = emptyDataset() ;
Node subject = NodeFactory.createURI("http://example/s");
Node predicate = NodeFactory.createURI("http://example/p");
- Node object = NodeFactory.createAnon();
+ Node object = NodeFactory.createBlankNode();
dsg.add(new Quad(Quad.defaultGraphIRI, subject, predicate, object));
dsg.deleteAny(Node.ANY, subject, null, null);
}
@@ -243,8 +243,8 @@ public abstract class AbstractDatasetGraphTests
DatasetGraph dsg = emptyDataset() ;
Node subject = NodeFactory.createURI("http://example/s");
Node predicate = NodeFactory.createURI("http://example/p");
- Node object1 = NodeFactory.createAnon();
- Node object2 = NodeFactory.createAnon();
+ Node object1 = NodeFactory.createBlankNode();
+ Node object2 = NodeFactory.createBlankNode();
Node graph = NodeFactory.createURI("http://example/g") ;
dsg.add(graph, subject, predicate, object1);
http://git-wip-us.apache.org/repos/asf/jena/blob/64e23ff5/jena-arq/src/test/java/org/apache/jena/sparql/engine/binding/TestBindingStreams.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/engine/binding/TestBindingStreams.java b/jena-arq/src/test/java/org/apache/jena/sparql/engine/binding/TestBindingStreams.java
index d8bbb26..d10bf7e 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/engine/binding/TestBindingStreams.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/engine/binding/TestBindingStreams.java
@@ -27,7 +27,6 @@ import org.apache.jena.atlas.junit.BaseTest ;
import org.apache.jena.atlas.legacy.BaseTest2 ;
import org.apache.jena.graph.Node ;
import org.apache.jena.graph.NodeFactory ;
-import org.apache.jena.rdf.model.AnonId ;
import org.apache.jena.riot.RiotException ;
import org.apache.jena.riot.system.PrefixMap ;
import org.apache.jena.riot.system.PrefixMapFactory ;
@@ -98,7 +97,7 @@ public class TestBindingStreams extends BaseTest
public void bindingStream_61()
{
BindingMap b = BindingFactory.create() ;
- Node bn = NodeFactory.createAnon(new AnonId("unusual")) ;
+ Node bn = NodeFactory.createBlankNode("unusual") ;
b.add(Var.alloc("v"), bn) ;
testWriteRead(b) ;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/64e23ff5/jena-arq/src/test/java/org/apache/jena/sparql/engine/iterator/TestQueryIterSort.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/engine/iterator/TestQueryIterSort.java b/jena-arq/src/test/java/org/apache/jena/sparql/engine/iterator/TestQueryIterSort.java
index cee1fae..e7eeb68 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/engine/iterator/TestQueryIterSort.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/engine/iterator/TestQueryIterSort.java
@@ -251,16 +251,16 @@ public class TestQueryIterSort {
private Binding randomBinding(Var[] vars)
{
BindingMap binding = BindingFactory.create();
- binding.add(vars[0], NodeFactory.createAnon());
+ binding.add(vars[0], NodeFactory.createBlankNode());
binding.add(vars[1], NodeFactory.createURI(randomURI()));
binding.add(vars[2], NodeFactory.createURI(randomURI()));
binding.add(vars[3], NodeFactory.createLiteral(randomString(20)));
- binding.add(vars[4], NodeFactory.createAnon());
+ binding.add(vars[4], NodeFactory.createBlankNode());
binding.add(vars[5], NodeFactory.createURI(randomURI()));
binding.add(vars[6], NodeFactory.createURI(randomURI()));
binding.add(vars[7], NodeFactory.createLiteral(randomString(5)));
binding.add(vars[8], NodeFactory.createLiteral("" + random.nextInt(), XSDDatatype.XSDinteger));
- binding.add(vars[9], NodeFactory.createAnon());
+ binding.add(vars[9], NodeFactory.createBlankNode());
return binding;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/64e23ff5/jena-arq/src/test/java/org/apache/jena/sparql/expr/TestExpressions.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/expr/TestExpressions.java b/jena-arq/src/test/java/org/apache/jena/sparql/expr/TestExpressions.java
index 05c55fd..631aac9 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/expr/TestExpressions.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/expr/TestExpressions.java
@@ -406,7 +406,7 @@ public class TestExpressions
static {
BindingMap b = BindingFactory.create() ;
b.add(Var.alloc("a"), NodeFactory.createLiteral("A")) ;
- b.add(Var.alloc("b"), NodeFactory.createAnon()) ;
+ b.add(Var.alloc("b"), NodeFactory.createBlankNode()) ;
b.add(Var.alloc("x"), NodeFactory.createURI("urn:x")) ;
env = b ;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/64e23ff5/jena-arq/src/test/java/org/apache/jena/sparql/expr/TestNodeFunctions.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/expr/TestNodeFunctions.java b/jena-arq/src/test/java/org/apache/jena/sparql/expr/TestNodeFunctions.java
index 2ab01ea..cbb5fba 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/expr/TestNodeFunctions.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/expr/TestNodeFunctions.java
@@ -115,7 +115,7 @@ public class TestNodeFunctions extends BaseTest {
@Test(expected=ExprTypeException.class)
public void testStr4() {
- Node n = NodeFactory.createAnon() ;
+ Node n = NodeFactory.createBlankNode() ;
String s = NodeFunctions.str(n) ;
}
@@ -162,7 +162,7 @@ public class TestNodeFunctions extends BaseTest {
@Test(expected=ExprTypeException.class)
public void testDatatype6() {
- NodeValue nv = NodeValue.makeNode(NodeFactory.createAnon()) ;
+ NodeValue nv = NodeValue.makeNode(NodeFactory.createBlankNode()) ;
NodeValue r = NodeFunctions.datatype(nv) ;
}
@@ -289,7 +289,7 @@ public class TestNodeFunctions extends BaseTest {
}
@Test public void testIsBlank1() {
- NodeValue nv = NodeValue.makeNode(NodeFactory.createAnon()) ;
+ NodeValue nv = NodeValue.makeNode(NodeFactory.createBlankNode()) ;
NodeValue r = NodeFunctions.isBlank(nv) ;
assertEquals(NodeValue.TRUE, r) ;
http://git-wip-us.apache.org/repos/asf/jena/blob/64e23ff5/jena-arq/src/test/java/org/apache/jena/sparql/expr/TestOrdering.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/expr/TestOrdering.java b/jena-arq/src/test/java/org/apache/jena/sparql/expr/TestOrdering.java
index c62b16a..43f7dbf 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/expr/TestOrdering.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/expr/TestOrdering.java
@@ -269,7 +269,7 @@ public class TestOrdering extends BaseTest
@Test public void test_variable3() {
Node x = NodeFactory.createVariable("x");
- Node y = NodeFactory.createAnon();
+ Node y = NodeFactory.createBlankNode();
int res = NodeUtils.compareRDFTerms(x, y);
assertTrue("Variable nodes should be less than blank nodes", Expr.CMP_LESS == res);
http://git-wip-us.apache.org/repos/asf/jena/blob/64e23ff5/jena-arq/src/test/java/org/apache/jena/sparql/expr/TestXSDFuncOp.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/expr/TestXSDFuncOp.java b/jena-arq/src/test/java/org/apache/jena/sparql/expr/TestXSDFuncOp.java
index 3e31097..8d46cb5 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/expr/TestXSDFuncOp.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/expr/TestXSDFuncOp.java
@@ -425,7 +425,7 @@ public class TestXSDFuncOp extends BaseTest
@Test public void testCompare23()
{
- NodeValue nv1 = NodeValue.makeNode(NodeFactory.createAnon()) ;
+ NodeValue nv1 = NodeValue.makeNode(NodeFactory.createBlankNode()) ;
NodeValue nv2 = NodeValue.makeString("5") ;
try {
@@ -452,7 +452,7 @@ public class TestXSDFuncOp extends BaseTest
@Test public void testSameUnknown_2()
{
- NodeValue nv1 = NodeValue.makeNode(NodeFactory.createAnon()) ;
+ NodeValue nv1 = NodeValue.makeNode(NodeFactory.createBlankNode()) ;
NodeValue nv2 = NodeValue.makeNode(NodeFactory.createURI("test:abc")) ;
assertFalse(NodeValue.sameAs(nv1, nv2)) ;
@@ -569,7 +569,7 @@ public class TestXSDFuncOp extends BaseTest
@Test public void testCompareGeneral1()
{
- NodeValue nv1 = NodeValue.makeNode(NodeFactory.createAnon()) ;
+ NodeValue nv1 = NodeValue.makeNode(NodeFactory.createBlankNode()) ;
NodeValue nv2 = NodeValue.makeString("5") ;
// bNodes before strings
@@ -579,7 +579,7 @@ public class TestXSDFuncOp extends BaseTest
@Test public void testCompareGeneral2()
{
- NodeValue nv1 = NodeValue.makeNode(NodeFactory.createAnon()) ;
+ NodeValue nv1 = NodeValue.makeNode(NodeFactory.createBlankNode()) ;
NodeValue nv2 = NodeValue.makeNode(NodeFactory.createURI("test:abc")) ;
// bNodes before URIs
http://git-wip-us.apache.org/repos/asf/jena/blob/64e23ff5/jena-arq/src/test/java/org/apache/jena/sparql/modify/AbstractTestUpdateGraph.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/modify/AbstractTestUpdateGraph.java b/jena-arq/src/test/java/org/apache/jena/sparql/modify/AbstractTestUpdateGraph.java
index 2220f03..7b31201 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/modify/AbstractTestUpdateGraph.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/modify/AbstractTestUpdateGraph.java
@@ -223,7 +223,7 @@ public abstract class AbstractTestUpdateGraph extends AbstractTestUpdateBase
@Test public void testModify2()
{
// Use blank nodes (will expose any problems in serialization when spill occurs)
- Triple t = new Triple(org.apache.jena.graph.NodeFactory.createAnon(),p,o2);
+ Triple t = new Triple(org.apache.jena.graph.NodeFactory.createBlankNode(),p,o2);
DatasetGraph gStore = getEmptyDatasetGraph() ;
// Set the threshold to in order to force spill to disk
@@ -272,8 +272,8 @@ public abstract class AbstractTestUpdateGraph extends AbstractTestUpdateBase
@Test public void testCopy()
{
// Use blank nodes (will expose any problems in serialization when spill occurs)
- Triple t = new Triple(org.apache.jena.graph.NodeFactory.createAnon(),p,o2);
- Triple t2 = new Triple(org.apache.jena.graph.NodeFactory.createAnon(),p,o1);
+ Triple t = new Triple(org.apache.jena.graph.NodeFactory.createBlankNode(),p,o2);
+ Triple t2 = new Triple(org.apache.jena.graph.NodeFactory.createBlankNode(),p,o1);
DatasetGraph gStore = getEmptyDatasetGraph() ;
// Set the threshold to in order to force spill to disk
@@ -333,7 +333,7 @@ public abstract class AbstractTestUpdateGraph extends AbstractTestUpdateBase
Graph g = GraphFactory.createPlainGraph() ;
- Node b = org.apache.jena.graph.NodeFactory.createAnon() ;
+ Node b = org.apache.jena.graph.NodeFactory.createBlankNode() ;
g.add(new Triple(s, p, b)) ;
g.add(new Triple(b, q, v)) ;
http://git-wip-us.apache.org/repos/asf/jena/blob/64e23ff5/jena-arq/src/test/java/org/apache/jena/sparql/util/TestFmtUtils.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/util/TestFmtUtils.java b/jena-arq/src/test/java/org/apache/jena/sparql/util/TestFmtUtils.java
index 1ff802e..b298792 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/util/TestFmtUtils.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/util/TestFmtUtils.java
@@ -138,15 +138,15 @@ public class TestFmtUtils
@Test
public void anonNode1() {
FmtUtils.resetBNodeLabels();
- assertEquals("_:b0", FmtUtils.stringForNode(NodeFactory.createAnon())) ;
+ assertEquals("_:b0", FmtUtils.stringForNode(NodeFactory.createBlankNode())) ;
}
@Test
public void anonNode2() {
FmtUtils.resetBNodeLabels();
- assertEquals("_:b0", FmtUtils.stringForNode(NodeFactory.createAnon())) ;
- assertEquals("_:b1", FmtUtils.stringForNode(NodeFactory.createAnon())) ;
- assertEquals("_:b2", FmtUtils.stringForNode(NodeFactory.createAnon())) ;
+ assertEquals("_:b0", FmtUtils.stringForNode(NodeFactory.createBlankNode())) ;
+ assertEquals("_:b1", FmtUtils.stringForNode(NodeFactory.createBlankNode())) ;
+ assertEquals("_:b2", FmtUtils.stringForNode(NodeFactory.createBlankNode())) ;
}
@Test
http://git-wip-us.apache.org/repos/asf/jena/blob/64e23ff5/jena-core/src/main/java/org/apache/jena/n3/turtle/LabelToNodeMap.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/n3/turtle/LabelToNodeMap.java b/jena-core/src/main/java/org/apache/jena/n3/turtle/LabelToNodeMap.java
index f0867a9..c8eef67 100644
--- a/jena-core/src/main/java/org/apache/jena/n3/turtle/LabelToNodeMap.java
+++ b/jena-core/src/main/java/org/apache/jena/n3/turtle/LabelToNodeMap.java
@@ -46,7 +46,7 @@ public class LabelToNodeMap
public Node allocNode()
{
- return NodeFactory.createAnon() ;
+ return NodeFactory.createBlankNode() ;
}
public void clear()
http://git-wip-us.apache.org/repos/asf/jena/blob/64e23ff5/jena-core/src/main/java/org/apache/jena/n3/turtle/ParserBase.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/n3/turtle/ParserBase.java b/jena-core/src/main/java/org/apache/jena/n3/turtle/ParserBase.java
index 2bb6ec3..bd581a5 100644
--- a/jena-core/src/main/java/org/apache/jena/n3/turtle/ParserBase.java
+++ b/jena-core/src/main/java/org/apache/jena/n3/turtle/ParserBase.java
@@ -26,7 +26,6 @@ import org.apache.jena.graph.NodeFactory ;
import org.apache.jena.graph.Triple ;
import org.apache.jena.n3.IRIResolver ;
import org.apache.jena.n3.JenaURIException ;
-import org.apache.jena.rdf.model.AnonId ;
import org.apache.jena.shared.PrefixMapping ;
import org.apache.jena.shared.impl.PrefixMappingImpl ;
import org.apache.jena.vocabulary.RDF ;
@@ -255,7 +254,7 @@ public class ParserBase
if ( isBNodeIRI(iri) )
{
String s = iri.substring(bNodeLabelStart.length()) ;
- Node n = NodeFactory.createAnon(new AnonId(s)) ;
+ Node n = NodeFactory.createBlankNode(s) ;
return n ;
}
return NodeFactory.createURI(iri) ;
http://git-wip-us.apache.org/repos/asf/jena/blob/64e23ff5/jena-core/src/main/java/org/apache/jena/rdf/model/impl/ModelCom.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/rdf/model/impl/ModelCom.java b/jena-core/src/main/java/org/apache/jena/rdf/model/impl/ModelCom.java
index 8d25a3e..96ab379 100644
--- a/jena-core/src/main/java/org/apache/jena/rdf/model/impl/ModelCom.java
+++ b/jena-core/src/main/java/org/apache/jena/rdf/model/impl/ModelCom.java
@@ -911,7 +911,7 @@ implements Model, PrefixMapping, Lock
{ return r.inModel( this ).as( Bag.class ); }
static private Node makeURI(String uri)
- { return uri == null ? NodeFactory.createAnon() : NodeFactory.createURI( uri ); }
+ { return uri == null ? NodeFactory.createBlankNode() : NodeFactory.createURI( uri ); }
@Override
public Alt getAlt( String uri )
@@ -1327,7 +1327,7 @@ implements Model, PrefixMapping, Lock
@Override
public Resource createResource()
- { return IteratorFactory.asResource( NodeFactory.createAnon(),this ); }
+ { return IteratorFactory.asResource( NodeFactory.createBlankNode(),this ); }
@Override
public Resource createResource( String uri )
http://git-wip-us.apache.org/repos/asf/jena/blob/64e23ff5/jena-core/src/main/java/org/apache/jena/rdf/model/impl/ReifierStd.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/rdf/model/impl/ReifierStd.java b/jena-core/src/main/java/org/apache/jena/rdf/model/impl/ReifierStd.java
index 0bf7d26..53bc9fb 100644
--- a/jena-core/src/main/java/org/apache/jena/rdf/model/impl/ReifierStd.java
+++ b/jena-core/src/main/java/org/apache/jena/rdf/model/impl/ReifierStd.java
@@ -206,7 +206,7 @@ public class ReifierStd
public static Node reifyAs(Graph graph, Node node, Triple triple)
{
if ( node == null )
- node = NodeFactory.createAnon() ;
+ node = NodeFactory.createBlankNode() ;
else
{
Triple t = getTriple(graph, node) ;
http://git-wip-us.apache.org/repos/asf/jena/blob/64e23ff5/jena-core/src/main/java/org/apache/jena/rdf/model/impl/ResourceImpl.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/rdf/model/impl/ResourceImpl.java b/jena-core/src/main/java/org/apache/jena/rdf/model/impl/ResourceImpl.java
index 7d3498d..3d36065 100644
--- a/jena-core/src/main/java/org/apache/jena/rdf/model/impl/ResourceImpl.java
+++ b/jena-core/src/main/java/org/apache/jena/rdf/model/impl/ResourceImpl.java
@@ -19,8 +19,11 @@
package org.apache.jena.rdf.model.impl;
import org.apache.jena.datatypes.RDFDatatype ;
-import org.apache.jena.enhanced.* ;
-import org.apache.jena.graph.* ;
+import org.apache.jena.enhanced.EnhGraph ;
+import org.apache.jena.enhanced.EnhNode ;
+import org.apache.jena.enhanced.Implementation ;
+import org.apache.jena.graph.Node ;
+import org.apache.jena.graph.NodeFactory ;
import org.apache.jena.rdf.model.* ;
/** An implementation of Resource.
@@ -90,7 +93,7 @@ public class ResourceImpl extends EnhNode implements Resource {
}
public ResourceImpl(AnonId id, ModelCom m) {
- this( NodeFactory.createAnon( id ), m );
+ this( NodeFactory.createBlankNode( id.getLabelString() ), m );
}
public ResourceImpl(String uri, ModelCom m) {
@@ -128,11 +131,11 @@ public class ResourceImpl extends EnhNode implements Resource {
}
private static Node fresh( String uri )
- { return uri == null ? NodeFactory.createAnon() : NodeFactory.createURI( uri ); }
+ { return uri == null ? NodeFactory.createBlankNode() : NodeFactory.createURI( uri ); }
@Override
public AnonId getId()
- { return asNode().getBlankNodeId(); }
+ { return new AnonId(asNode().getBlankNodeId()); }
@Override
public String getURI() {
http://git-wip-us.apache.org/repos/asf/jena/blob/64e23ff5/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/JenaReader.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/JenaReader.java b/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/JenaReader.java
index 92bddfe..1995306 100644
--- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/JenaReader.java
+++ b/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/JenaReader.java
@@ -121,7 +121,7 @@ public class JenaReader implements RDFReader, ARPErrorNumbers {
// String id = r.getAnonymousID();
Node rr = (Node) r.getUserData();
if (rr == null) {
- rr = NodeFactory.createAnon();
+ rr = NodeFactory.createBlankNode();
r.setUserData(rr);
}
return rr;
http://git-wip-us.apache.org/repos/asf/jena/blob/64e23ff5/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/FBRuleInfGraph.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/FBRuleInfGraph.java b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/FBRuleInfGraph.java
index b2acc03..18b27d3 100644
--- a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/FBRuleInfGraph.java
+++ b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/FBRuleInfGraph.java
@@ -726,7 +726,7 @@ public class FBRuleInfGraph extends BasicForwardRuleInfGraph implements Backwar
checkOpen();
StandardValidityReport report = new StandardValidityReport();
// Switch on validation
- Triple validateOn = new Triple(NodeFactory.createAnon(),
+ Triple validateOn = new Triple(NodeFactory.createBlankNode(),
ReasonerVocabulary.RB_VALIDATION.asNode(),
Functor.makeFunctorNode("on", new Node[] {}));
// We sneak this switch directly into the engine to avoid contaminating the
http://git-wip-us.apache.org/repos/asf/jena/blob/64e23ff5/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/Rule.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/Rule.java b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/Rule.java
index 82e1057..1057489 100755
--- a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/Rule.java
+++ b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/Rule.java
@@ -18,21 +18,16 @@
package org.apache.jena.reasoner.rulesys;
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.NoSuchElementException;
+import java.io.BufferedReader ;
+import java.io.IOException ;
+import java.io.InputStream ;
+import java.util.* ;
import org.apache.jena.datatypes.RDFDatatype ;
import org.apache.jena.datatypes.TypeMapper ;
import org.apache.jena.datatypes.xsd.XSDDatatype ;
import org.apache.jena.graph.Node ;
import org.apache.jena.graph.NodeFactory ;
-import org.apache.jena.rdf.model.AnonId ;
import org.apache.jena.reasoner.ReasonerException ;
import org.apache.jena.reasoner.TriplePattern ;
import org.apache.jena.shared.JenaException ;
@@ -43,8 +38,8 @@ import org.apache.jena.util.FileManager ;
import org.apache.jena.util.FileUtils ;
import org.apache.jena.util.PrintUtil ;
import org.apache.jena.util.Tokenizer ;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.slf4j.Logger ;
+import org.slf4j.LoggerFactory ;
/**Representation of a generic inference rule.
* <p>
@@ -847,7 +842,7 @@ public class Rule implements ClauseEntry {
String uri = token.substring(1, token.length()-1);
return NodeFactory.createURI(uri);
} else if (token.startsWith( "_" )) { // TODO rationalise [this is for the RIF code]
- return NodeFactory.createAnon( new AnonId( token.substring( 1 ) ) );
+ return NodeFactory.createBlankNode( token.substring( 1 ) );
} else if (token.indexOf(':') != -1) {
String exp = prefixMapping.expandPrefix(token); // Local map first
exp = PrintUtil.expandQname(exp); // Retain global map for backward compatibility
http://git-wip-us.apache.org/repos/asf/jena/blob/64e23ff5/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/Util.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/Util.java b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/Util.java
index 6b6dc9e..33fe7e3 100755
--- a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/Util.java
+++ b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/Util.java
@@ -247,7 +247,7 @@ public class Util {
*/
private static Node doMakeList(Node[] nodes, int next, Graph graph) {
if (next < nodes.length) {
- Node listNode = NodeFactory.createAnon();
+ Node listNode = NodeFactory.createBlankNode();
graph.add(new Triple(listNode, RDF.Nodes.first, nodes[next]));
graph.add(new Triple(listNode, RDF.Nodes.rest, doMakeList(nodes, next+1, graph)));
return listNode;
http://git-wip-us.apache.org/repos/asf/jena/blob/64e23ff5/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/builtins/MakeSkolem.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/builtins/MakeSkolem.java b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/builtins/MakeSkolem.java
index e3eb48c..b5aedb9 100644
--- a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/builtins/MakeSkolem.java
+++ b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/builtins/MakeSkolem.java
@@ -18,15 +18,14 @@
package org.apache.jena.reasoner.rulesys.builtins;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
+import java.security.MessageDigest ;
+import java.security.NoSuchAlgorithmException ;
import org.apache.jena.graph.Node ;
import org.apache.jena.graph.NodeFactory ;
-import org.apache.jena.rdf.model.AnonId ;
import org.apache.jena.reasoner.rulesys.RuleContext ;
import org.apache.jena.shared.JenaException ;
-import org.apache.xerces.impl.dv.util.Base64;
+import org.apache.xerces.impl.dv.util.Base64 ;
/**
* Bind a blank node to the first argument.
@@ -73,11 +72,10 @@ public class MakeSkolem extends BaseBuiltin {
}
try {
-
MessageDigest digester = MessageDigest.getInstance("MD5");
digester.reset();
byte[] digest = digester.digest(key.toString().getBytes());
- Node skolem = NodeFactory.createAnon( new AnonId( Base64.encode(digest) ) );
+ Node skolem = NodeFactory.createBlankNode(Base64.encode(digest));
return context.getEnv().bind(args[0], skolem);
} catch (NoSuchAlgorithmException e) {
http://git-wip-us.apache.org/repos/asf/jena/blob/64e23ff5/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/builtins/MakeTemp.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/builtins/MakeTemp.java b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/builtins/MakeTemp.java
index 98f33f7..cc4c1ae 100644
--- a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/builtins/MakeTemp.java
+++ b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/builtins/MakeTemp.java
@@ -48,7 +48,7 @@ public class MakeTemp extends BaseBuiltin {
@Override
public boolean bodyCall(Node[] args, int length, RuleContext context) {
for (int i = 0; i < length; i++) {
- if (!context.getEnv().bind(args[i], NodeFactory.createAnon())) return false;
+ if (!context.getEnv().bind(args[i], NodeFactory.createBlankNode())) return false;
}
return true;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/64e23ff5/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/impl/BindingStack.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/impl/BindingStack.java b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/impl/BindingStack.java
index f0629d2..d4e883f 100644
--- a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/impl/BindingStack.java
+++ b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/impl/BindingStack.java
@@ -209,11 +209,11 @@ public class BindingStack implements BindingEnvironment {
@Override
public Triple instantiate(TriplePattern pattern) {
Node s = getGroundVersion(pattern.getSubject());
- if (s.isVariable()) s = NodeFactory.createAnon();
+ if (s.isVariable()) s = NodeFactory.createBlankNode();
Node p = getGroundVersion(pattern.getPredicate());
- if (p.isVariable()) p = NodeFactory.createAnon();
+ if (p.isVariable()) p = NodeFactory.createBlankNode();
Node o = getGroundVersion(pattern.getObject());
- if (o.isVariable()) o = NodeFactory.createAnon();
+ if (o.isVariable()) o = NodeFactory.createBlankNode();
return new Triple(s, p, o);
}
http://git-wip-us.apache.org/repos/asf/jena/blob/64e23ff5/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/impl/BindingVector.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/impl/BindingVector.java b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/impl/BindingVector.java
index bf45829..70a20d1 100644
--- a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/impl/BindingVector.java
+++ b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/impl/BindingVector.java
@@ -192,11 +192,11 @@ public class BindingVector implements BindingEnvironment {
@Override
public Triple instantiate(TriplePattern pattern) {
Node s = getGroundVersion(pattern.getSubject());
- if (s.isVariable()) s = NodeFactory.createAnon();
+ if (s.isVariable()) s = NodeFactory.createBlankNode();
Node p = getGroundVersion(pattern.getPredicate());
- if (p.isVariable()) p = NodeFactory.createAnon();
+ if (p.isVariable()) p = NodeFactory.createBlankNode();
Node o = getGroundVersion(pattern.getObject());
- if (o.isVariable()) o = NodeFactory.createAnon();
+ if (o.isVariable()) o = NodeFactory.createBlankNode();
return new Triple(s, p, o);
}
http://git-wip-us.apache.org/repos/asf/jena/blob/64e23ff5/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/impl/LPBindingEnvironment.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/impl/LPBindingEnvironment.java b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/impl/LPBindingEnvironment.java
index 9c686b3..825de29 100644
--- a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/impl/LPBindingEnvironment.java
+++ b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/impl/LPBindingEnvironment.java
@@ -79,11 +79,11 @@ public class LPBindingEnvironment implements BindingEnvironment {
@Override
public Triple instantiate(TriplePattern pattern) {
Node s = getGroundVersion(pattern.getSubject());
- if (s.isVariable()) s = NodeFactory.createAnon();
+ if (s.isVariable()) s = NodeFactory.createBlankNode();
Node p = getGroundVersion(pattern.getPredicate());
- if (p.isVariable()) p = NodeFactory.createAnon();
+ if (p.isVariable()) p = NodeFactory.createBlankNode();
Node o = getGroundVersion(pattern.getObject());
- if (o.isVariable()) o = NodeFactory.createAnon();
+ if (o.isVariable()) o = NodeFactory.createBlankNode();
return new Triple(s, p, o);
}
http://git-wip-us.apache.org/repos/asf/jena/blob/64e23ff5/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/impl/TempNodeCache.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/impl/TempNodeCache.java b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/impl/TempNodeCache.java
index 57a2b5e..684f7c0 100644
--- a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/impl/TempNodeCache.java
+++ b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/impl/TempNodeCache.java
@@ -78,7 +78,7 @@ public class TempNodeCache {
}
if (result == null) {
// No value yet, so create one
- result = NodeFactory.createAnon();
+ result = NodeFactory.createBlankNode();
ipMap.put(ip, result);
if (pclass != null) {
classMap.put(result, pclass);
http://git-wip-us.apache.org/repos/asf/jena/blob/64e23ff5/jena-core/src/test/java/org/apache/jena/enhanced/test/TestPackage.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/org/apache/jena/enhanced/test/TestPackage.java b/jena-core/src/test/java/org/apache/jena/enhanced/test/TestPackage.java
index f895560..c648cf5 100644
--- a/jena-core/src/test/java/org/apache/jena/enhanced/test/TestPackage.java
+++ b/jena-core/src/test/java/org/apache/jena/enhanced/test/TestPackage.java
@@ -389,7 +389,7 @@ public class TestPackage extends GraphTestBase {
EnhGraph eg = new EnhGraph( g, ours );
Node n = NodeFactory.createURI( "spoo:bar" );
EnhNode eNode = new EnhNode( NodeFactory.createURI( "spoo:bar" ), eg );
- EnhNode eBlank = new EnhNode( NodeFactory.createAnon(), eg );
+ EnhNode eBlank = new EnhNode( NodeFactory.createBlankNode(), eg );
assertTrue( "URI node can be an Example", eNode.supports( Example.class ) );
assertFalse( "Blank node cannot be an Example", eBlank.supports( Example.class ) );
}
http://git-wip-us.apache.org/repos/asf/jena/blob/64e23ff5/jena-core/src/test/java/org/apache/jena/graph/test/AbstractTestReifier.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/org/apache/jena/graph/test/AbstractTestReifier.java b/jena-core/src/test/java/org/apache/jena/graph/test/AbstractTestReifier.java
index c5fb962..04cc982 100644
--- a/jena-core/src/test/java/org/apache/jena/graph/test/AbstractTestReifier.java
+++ b/jena-core/src/test/java/org/apache/jena/graph/test/AbstractTestReifier.java
@@ -148,7 +148,7 @@ public abstract class AbstractTestReifier extends GraphTestBase
public void testRetrieveTriplesByNode()
{
Graph G = getGraph();
- Node N = NodeFactory.createAnon(), M = NodeFactory.createAnon();
+ Node N = NodeFactory.createBlankNode(), M = NodeFactory.createBlankNode();
ReifierStd.reifyAs( G , N, triple( "x R y" ) );
assertEquals( "gets correct triple", triple( "x R y" ), ReifierStd.getTriple( G , N ) );
ReifierStd.reifyAs( G, M, triple( "p S q" ) );
http://git-wip-us.apache.org/repos/asf/jena/blob/64e23ff5/jena-core/src/test/java/org/apache/jena/graph/test/NodeCreateUtils.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/org/apache/jena/graph/test/NodeCreateUtils.java b/jena-core/src/test/java/org/apache/jena/graph/test/NodeCreateUtils.java
index 4e97012..c1ec4f6 100644
--- a/jena-core/src/test/java/org/apache/jena/graph/test/NodeCreateUtils.java
+++ b/jena-core/src/test/java/org/apache/jena/graph/test/NodeCreateUtils.java
@@ -21,12 +21,12 @@ package org.apache.jena.graph.test;
import java.util.StringTokenizer;
import org.apache.jena.datatypes.xsd.XSDDatatype ;
+import org.apache.jena.graph.BlankNodeId ;
import org.apache.jena.graph.Node ;
import org.apache.jena.graph.NodeFactory ;
import org.apache.jena.graph.Triple ;
import org.apache.jena.graph.impl.LiteralLabel ;
import org.apache.jena.graph.impl.LiteralLabelFactory ;
-import org.apache.jena.rdf.model.AnonId ;
import org.apache.jena.shared.* ;
/**
@@ -83,7 +83,7 @@ public class NodeCreateUtils
if (Character.isDigit( first ))
return NodeFactory.createLiteral( x, XSDDatatype.XSDinteger );
if (first == '_')
- return NodeFactory.createAnon( new AnonId( x ) );
+ return NodeFactory.createBlankNode( BlankNodeId.create( x ) );
if (x.equals( "??" ))
return Node.ANY;
if (first == '?')
[7/8] jena git commit: Align to 'master' branch of Jena.
Posted by an...@apache.org.
Align to 'master' branch of Jena.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/43ade4aa
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/43ade4aa
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/43ade4aa
Branch: refs/heads/master
Commit: 43ade4aa7547cef5a9697487cc5ad814f65ca9a8
Parents: 64e23ff 6001719
Author: Andy Seaborne <an...@apache.org>
Authored: Mon Jul 13 11:47:13 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Mon Jul 13 11:47:13 2015 +0100
----------------------------------------------------------------------
.../optimize/TransformEliminateAssignments.java | 11 ++-
.../algebra/optimize/VariableUsageVisitor.java | 8 +-
.../TestTransformEliminateAssignments.java | 65 +++++++++++++-
jena-core/pom.xml | 10 +--
.../util/iterator/EarlyBindingIterator.java | 40 ---------
.../jena/util/iterator/LateBindingIterator.java | 78 ----------------
.../util/iterator/UniqueExtendedIterator.java | 94 --------------------
7 files changed, 77 insertions(+), 229 deletions(-)
----------------------------------------------------------------------
[4/8] jena git commit: JENA-986: AnonId is now a holder for a system
BlankNodeId.
Posted by an...@apache.org.
JENA-986: AnonId is now a holder for a system BlankNodeId.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/ebabda72
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/ebabda72
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/ebabda72
Branch: refs/heads/master
Commit: ebabda724e939c45b1a7905fcc9316f3f6eaf1fe
Parents: 20ab2e2
Author: Andy Seaborne <an...@apache.org>
Authored: Mon Jul 13 11:38:56 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Mon Jul 13 11:38:56 2015 +0100
----------------------------------------------------------------------
.../java/org/apache/jena/rdf/model/AnonId.java | 121 ++++++++-----------
1 file changed, 48 insertions(+), 73 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/ebabda72/jena-core/src/main/java/org/apache/jena/rdf/model/AnonId.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/rdf/model/AnonId.java b/jena-core/src/main/java/org/apache/jena/rdf/model/AnonId.java
index 3b06e5c..5d52193 100644
--- a/jena-core/src/main/java/org/apache/jena/rdf/model/AnonId.java
+++ b/jena-core/src/main/java/org/apache/jena/rdf/model/AnonId.java
@@ -18,100 +18,75 @@
package org.apache.jena.rdf.model;
-import java.rmi.server.UID;
+import org.apache.jena.graph.BlankNodeId ;
-import org.apache.jena.shared.impl.JenaParameters ;
-
-/** Create a new id for an anonymous node.
+/** System id for an anonymous node.
+ * <p>
+ * Blank nodes have identity ({@code .equals} tells them apart)
+ * but have no web-visible external stable identifier like a URI.
+ * <p>
+ * The Jena API has traditionally had {@code AnonId}
+ * in the RDF API. {@link BlankNodeId} is the SPI equivalent and databases
+ * that need a persistent identifier across JVM instances use that for blank nodes.
*
* <p>This id is guaranteed to be unique on this machine.</p>
*/
-// This version contains experimental modifications by der to
-// switch off normal UID allocation for bNodes to assist tracking
-// down apparent non-deterministic behaviour.
-
-public class AnonId extends java.lang.Object {
-
- // Support for running in environments, like Google App Engine, where
- // java.rmi.server.UID is not available
- // Will be obsoleted by improved AnonId handling
- static boolean UIDok = true;
- static {
- try { new UID() ; }
- catch (Throwable ex) { UIDok = false ; }
- }
-
- protected String id = null;
-
- /**
- Support for debugging: global anonID counter. The intial value is just to
- make the output look prettier if it has lots (but not lots and lots) of bnodes
- in it.
- */
- private static int idCount = 100000;
+public class AnonId {
+ private final BlankNodeId blankNodeId ;
public static AnonId create()
{ return new AnonId(); }
public static AnonId create( String id )
{ return new AnonId( id ); }
+
+ public AnonId() {
+ blankNodeId = BlankNodeId.create() ;
+ }
- /**
- Creates new AnonId. Normally this id is guaranteed to be unique on this
- machine: it is time-dependant. However, sometimes [incorrect] code is
- sensitive to bnode ordering and produces bizarre bugs. Hence the
- disableBNodeUIDGeneration flag, which allows bnode IDs to be predictable.
- */
- public AnonId() {
- if (JenaParameters.disableBNodeUIDGeneration) {
- synchronized (AnonId.class) {
- id = "A" + idCount++; // + rand.nextLong();
- }
- } else if (!UIDok) {
- id = java.util.UUID.randomUUID().toString();
- } else {
- id = (new UID()).toString();
- }
+ /** Create a new AnonId from the string argument supplied
+ * @param idStr A string representation of the id to be created.
+ */
+ public AnonId( String idStr ) {
+ blankNodeId = BlankNodeId.create(idStr) ;
}
- /** Create a new AnonId from the string argument supplied
+ /** Create a new AnonId from the BlankNodeId argument supplied
* @param id A string representation of the id to be created.
*/
- public AnonId( String id ) {
- this.id = id;
- }
+ public AnonId( BlankNodeId id ) { blankNodeId = id ; }
+
+ public String getLabelString() { return blankNodeId.getLabelString() ; }
- /** Test whether two id's are the same
- @param o the object to be compared
- @return true if and only if the two id's are the same
- */
- @Override
- public boolean equals( Object o ) {
- return o instanceof AnonId && id.equals( ((AnonId) o).id );
- }
+ /** Return the system BlankNodeId */
+ public BlankNodeId getBlankNodeId() { return blankNodeId ; }
- /** return a string representation of the id
- * @return a string representation of the id
- */
@Override
- public String toString() {
- return id;
- }
+ public String toString() { return blankNodeId.toString() ; }
- /**
- Answer the label string of this AnonId. To be used in preference to
- toString().
- */
- public String getLabelString() {
- return id;
- }
-
- /** return a hashcode for this id
- * @return the hash code
- */
@Override
public int hashCode() {
- return id.hashCode();
+ final int prime = 31 ;
+ int result = 1 ;
+ result = prime * result + ((blankNodeId == null) ? 0 : blankNodeId.hashCode()) ;
+ return result ;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if ( this == obj )
+ return true ;
+ if ( obj == null )
+ return false ;
+ if ( !(obj instanceof AnonId) )
+ return false ;
+ AnonId other = (AnonId)obj ;
+ if ( blankNodeId == null ) {
+ if ( other.blankNodeId != null )
+ return false ;
+ } else if ( !blankNodeId.equals(other.blankNodeId) )
+ return false ;
+ return true ;
}
}
[5/8] jena git commit: Changes for AnonId/BlankNodeId and
createAnon->createBlankNode.
Posted by an...@apache.org.
http://git-wip-us.apache.org/repos/asf/jena/blob/64e23ff5/jena-core/src/test/java/org/apache/jena/graph/test/TestNode.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/org/apache/jena/graph/test/TestNode.java b/jena-core/src/test/java/org/apache/jena/graph/test/TestNode.java
index 3be7ac8..1d2907f 100644
--- a/jena-core/src/test/java/org/apache/jena/graph/test/TestNode.java
+++ b/jena-core/src/test/java/org/apache/jena/graph/test/TestNode.java
@@ -20,6 +20,7 @@ package org.apache.jena.graph.test;
import junit.framework.TestSuite ;
+
import org.apache.jena.JenaRuntime ;
import org.apache.jena.datatypes.RDFDatatype ;
import org.apache.jena.datatypes.TypeMapper ;
@@ -27,7 +28,6 @@ import org.apache.jena.datatypes.xsd.XSDDatatype ;
import org.apache.jena.graph.* ;
import org.apache.jena.graph.impl.LiteralLabel ;
import org.apache.jena.graph.impl.LiteralLabelFactory ;
-import org.apache.jena.rdf.model.AnonId ;
import org.apache.jena.rdf.model.impl.Util ;
import org.apache.jena.shared.JenaException ;
import org.apache.jena.shared.PrefixMapping ;
@@ -48,15 +48,15 @@ public class TestNode extends GraphTestBase
private static final String U = "http://some.domain.name/magic/spells.incant";
private static final String N = "Alice";
private static final LiteralLabel L = LiteralLabelFactory.create( "ashes are burning", "en", false );
- private static final AnonId A = AnonId.create();
+ private static final BlankNodeId A = BlankNodeId.create();
public void testBlanks()
{
- assertTrue( "anonymous nodes are blank", NodeFactory.createAnon().isBlank() );
- assertFalse( "anonymous nodes aren't literal", NodeFactory.createAnon().isLiteral() );
- assertFalse( "anonymous nodes aren't URIs", NodeFactory.createAnon().isURI() );
- assertFalse( "anonymous nodes aren't variables", NodeFactory.createAnon().isVariable() );
- assertEquals( "anonymous nodes have the right id", NodeFactory.createAnon(A).getBlankNodeId(), A );
+ assertTrue( "anonymous nodes are blank", NodeFactory.createBlankNode().isBlank() );
+ assertFalse( "anonymous nodes aren't literal", NodeFactory.createBlankNode().isLiteral() );
+ assertFalse( "anonymous nodes aren't URIs", NodeFactory.createBlankNode().isURI() );
+ assertFalse( "anonymous nodes aren't variables", NodeFactory.createBlankNode().isVariable() );
+ assertEquals( "anonymous nodes have the right id", NodeFactory.createBlankNode(A).getBlankNodeId(), A );
}
public void testLiterals()
@@ -114,7 +114,7 @@ public class TestNode extends GraphTestBase
*/
private Object [][] eqTestCases()
{
- AnonId id = AnonId.create();
+ BlankNodeId id = BlankNodeId.create();
LiteralLabel L2 = LiteralLabelFactory.create( id.toString(), "", false );
LiteralLabel LLang1 = LiteralLabelFactory.createByValue( "xyz", "en", null) ;
@@ -125,9 +125,9 @@ public class TestNode extends GraphTestBase
return new Object [][]
{
{ Node.ANY, "0" },
- { NodeFactory.createAnon( id ), "1" },
- { NodeFactory.createAnon(), "2" },
- { NodeFactory.createAnon( id ), "1" },
+ { NodeFactory.createBlankNode( id ), "1" },
+ { NodeFactory.createBlankNode(), "2" },
+ { NodeFactory.createBlankNode( id ), "1" },
{ NodeFactory.createLiteral( L ), "3" },
{ NodeFactory.createLiteral( L2 ), "4" },
@@ -178,10 +178,10 @@ public class TestNode extends GraphTestBase
assertDiffer( "different variables", NodeFactory.createVariable( "xx" ), NodeFactory.createVariable( "yy" ) );
assertEquals( "same vars", NodeFactory.createVariable( "aa" ), NodeFactory.createVariable( "aa" ) );
assertEquals( "same URI", NodeFactory.createURI( U ), NodeFactory.createURI( U ) );
- assertEquals( "same anon", NodeFactory.createAnon( A ), NodeFactory.createAnon( A ) );
+ assertEquals( "same anon", NodeFactory.createBlankNode( A ), NodeFactory.createBlankNode( A ) );
assertEquals( "same literal", NodeFactory.createLiteral( L ), NodeFactory.createLiteral( L ) );
assertFalse( "distinct URIs", NodeFactory.createURI( U ) == NodeFactory.createURI( U ) );
- assertFalse( "distinct hyphens", NodeFactory.createAnon( A ) == NodeFactory.createAnon( A ) );
+ assertFalse( "distinct hyphens", NodeFactory.createBlankNode( A ) == NodeFactory.createBlankNode( A ) );
assertFalse( "distinct literals", NodeFactory.createLiteral( L ) == NodeFactory.createLiteral( L ) );
assertFalse( "distinct vars", NodeFactory.createVariable( "aa" ) == NodeFactory.createVariable( "aa" ) );
}
@@ -192,9 +192,9 @@ public class TestNode extends GraphTestBase
*/
public void testLabels()
{
- AnonId id = AnonId.create();
+ BlankNodeId id = BlankNodeId.create();
assertEquals( "get URI value", U, NodeFactory.createURI( U ).getURI() );
- assertEquals( "get blank value", id, NodeFactory.createAnon( id ).getBlankNodeId() );
+ assertEquals( "get blank value", id, NodeFactory.createBlankNode( id ).getBlankNodeId() );
assertEquals( "get literal value", L, NodeFactory.createLiteral( L ).getLiteral() );
assertEquals( "get variable name", N, NodeFactory.createVariable( N ).getName() );
}
@@ -205,7 +205,7 @@ public class TestNode extends GraphTestBase
*/
public void testFailingLabels()
{
- Node u = NodeFactory.createURI( U ), b = NodeFactory.createAnon();
+ Node u = NodeFactory.createURI( U ), b = NodeFactory.createBlankNode();
Node l = NodeFactory.createLiteral( L ), v = NodeFactory.createVariable( N );
Node a = Node.ANY;
/* */
@@ -245,7 +245,7 @@ public class TestNode extends GraphTestBase
public void testGetBlankNodeLabelString()
{
- Node n = NodeFactory.createAnon();
+ Node n = NodeFactory.createBlankNode();
assertEquals( n.getBlankNodeId().getLabelString(), n.getBlankNodeLabel() );
}
@@ -272,13 +272,13 @@ public class TestNode extends GraphTestBase
/**
Test that anonymous nodes are created with the correct labels
*/
- public void testCreateAnon()
+ public void testCreateBlankNode()
{
String idA = "_xxx", idB = "_yyy";
Node a = NodeCreateUtils.create( idA ), b = NodeCreateUtils.create( idB );
assertTrue( "both must be bnodes", a.isBlank() && b.isBlank() );
- assertEquals( new AnonId( idA ), a.getBlankNodeId() );
- assertEquals( new AnonId( idB ), b.getBlankNodeId() );
+ assertEquals( BlankNodeId.create( idA ), a.getBlankNodeId() );
+ assertEquals( BlankNodeId.create( idB ), b.getBlankNodeId() );
}
public void testCreateVariable()
@@ -468,7 +468,7 @@ public class TestNode extends GraphTestBase
@Override
public Object visitAny( Node_ANY it ) { return it; }
@Override
- public Object visitBlank( Node_Blank it, AnonId id ) { return it; }
+ public Object visitBlank( Node_Blank it, BlankNodeId id ) { return it; }
@Override
public Object visitLiteral( Node_Literal it, LiteralLabel lit ) { return it; }
@Override
@@ -506,7 +506,7 @@ public class TestNode extends GraphTestBase
public Object visitAny( Node_ANY it )
{ return null; }
@Override
- public Object visitBlank( Node_Blank it, AnonId id )
+ public Object visitBlank( Node_Blank it, BlankNodeId id )
{ assertTrue( it.getBlankNodeId() == id ); return null; }
@Override
public Object visitLiteral( Node_Literal it, LiteralLabel lit )
@@ -534,7 +534,7 @@ public class TestNode extends GraphTestBase
public Object visitAny( Node_ANY it )
{ strings[0] += " any"; return null; }
@Override
- public Object visitBlank( Node_Blank it, AnonId id )
+ public Object visitBlank( Node_Blank it, BlankNodeId id )
{ strings[0] += " blank"; return null; }
@Override
public Object visitLiteral( Node_Literal it, LiteralLabel lit )
http://git-wip-us.apache.org/repos/asf/jena/blob/64e23ff5/jena-core/src/test/java/org/apache/jena/graph/test/TestTriple.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/org/apache/jena/graph/test/TestTriple.java b/jena-core/src/test/java/org/apache/jena/graph/test/TestTriple.java
index 6d72c1d..4192150 100644
--- a/jena-core/src/test/java/org/apache/jena/graph/test/TestTriple.java
+++ b/jena-core/src/test/java/org/apache/jena/graph/test/TestTriple.java
@@ -21,12 +21,13 @@ package org.apache.jena.graph.test;
import java.util.function.Function ;
import junit.framework.TestSuite ;
+
+import org.apache.jena.graph.BlankNodeId ;
import org.apache.jena.graph.Node ;
import org.apache.jena.graph.NodeFactory ;
import org.apache.jena.graph.Triple ;
import org.apache.jena.graph.impl.LiteralLabel ;
import org.apache.jena.graph.impl.LiteralLabelFactory ;
-import org.apache.jena.rdf.model.AnonId ;
import org.apache.jena.shared.PrefixMapping ;
public class TestTriple extends GraphTestBase
@@ -44,14 +45,14 @@ public class TestTriple extends GraphTestBase
public void testTripleEquals() {
// create some nodes to test
- AnonId id = AnonId.create();
+ BlankNodeId id = BlankNodeId.create();
LiteralLabel L2 = LiteralLabelFactory.create(id.toString(), "", false);
String U2 = id.toString();
String N2 = id.toString();
Node[] nodes = new Node[] {
Node.ANY,
- NodeFactory.createAnon(id), NodeFactory.createAnon(),
+ NodeFactory.createBlankNode(id), NodeFactory.createBlankNode(),
NodeFactory.createLiteral(L), NodeFactory.createLiteral(L2),
NodeFactory.createURI(U), NodeFactory.createURI(U2),
NodeFactory.createVariable(N), NodeFactory.createVariable(N2)
http://git-wip-us.apache.org/repos/asf/jena/blob/64e23ff5/jena-core/src/test/java/org/apache/jena/rdfxml/xmloutput/TestXMLFeatures.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/xmloutput/TestXMLFeatures.java b/jena-core/src/test/java/org/apache/jena/rdfxml/xmloutput/TestXMLFeatures.java
index bee5496..5d9463c 100644
--- a/jena-core/src/test/java/org/apache/jena/rdfxml/xmloutput/TestXMLFeatures.java
+++ b/jena-core/src/test/java/org/apache/jena/rdfxml/xmloutput/TestXMLFeatures.java
@@ -418,7 +418,7 @@ public class TestXMLFeatures extends XMLOutputTestBase {
// SystemOutAndErr.block();
// TestLogger tl = new TestLogger(BaseXMLWriter.class);
blockLogger() ;
- Node blank = NodeFactory.createAnon() ;
+ Node blank = NodeFactory.createBlankNode() ;
Node prop = NodeFactory.createURI(s) ;
Graph g = Factory.createGraphMem() ;
g.add(Triple.create(blank, prop, blank)) ;
http://git-wip-us.apache.org/repos/asf/jena/blob/64e23ff5/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/TestBugs.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/TestBugs.java b/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/TestBugs.java
index 8c92e77..dd14c03 100644
--- a/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/TestBugs.java
+++ b/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/TestBugs.java
@@ -821,7 +821,9 @@ public class TestBugs extends TestCase {
public boolean bodyCall(Node[] args, int length, RuleContext context) {
checkArgs(length, context);
BindingEnvironment env = context.getEnv();
- Triple t = new Triple( NodeFactory.createAnon(), NodeFactory.createURI("http://jena.hpl.hp.com/example#"), NodeFactory.createAnon());
+ Triple t = new Triple( NodeFactory.createBlankNode(),
+ NodeFactory.createURI("http://jena.hpl.hp.com/example#"),
+ NodeFactory.createBlankNode());
Node l = NodeFactory.createLiteral( LiteralLabelFactory.createTypedLiteral(t) );
return env.bind(args[0], l);
}
http://git-wip-us.apache.org/repos/asf/jena/blob/64e23ff5/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/TestFBRules.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/TestFBRules.java b/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/TestFBRules.java
index 5823630..ac5e2c5 100644
--- a/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/TestFBRules.java
+++ b/jena-core/src/test/java/org/apache/jena/reasoner/rulesys/test/TestFBRules.java
@@ -790,7 +790,7 @@ public class TestFBRules extends TestCase {
data = Factory.createGraphMem();
data.add(new Triple(n1, p, Util.makeIntNode(3)) );
data.add(new Triple(n2, p, res));
- data.add(new Triple(n3, p, NodeFactory.createAnon()));
+ data.add(new Triple(n3, p, NodeFactory.createBlankNode()));
infgraph = createInfGraph(rules, data);
TestUtil.assertIteratorValues(this, infgraph.find(n1, s, null),
http://git-wip-us.apache.org/repos/asf/jena/blob/64e23ff5/jena-core/src/test/java/org/apache/jena/testing_framework/NodeCreateUtils.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/org/apache/jena/testing_framework/NodeCreateUtils.java b/jena-core/src/test/java/org/apache/jena/testing_framework/NodeCreateUtils.java
index 83d42eb..b17282b 100644
--- a/jena-core/src/test/java/org/apache/jena/testing_framework/NodeCreateUtils.java
+++ b/jena-core/src/test/java/org/apache/jena/testing_framework/NodeCreateUtils.java
@@ -18,16 +18,16 @@
package org.apache.jena.testing_framework;
-import java.util.StringTokenizer;
+import java.util.StringTokenizer ;
-import org.apache.jena.datatypes.xsd.XSDDatatype;
-import org.apache.jena.graph.Node;
-import org.apache.jena.graph.NodeFactory;
-import org.apache.jena.graph.Triple;
-import org.apache.jena.graph.impl.LiteralLabel;
-import org.apache.jena.graph.impl.LiteralLabelFactory;
-import org.apache.jena.rdf.model.AnonId;
-import org.apache.jena.shared.*;
+import org.apache.jena.datatypes.xsd.XSDDatatype ;
+import org.apache.jena.graph.Node ;
+import org.apache.jena.graph.NodeFactory ;
+import org.apache.jena.graph.Triple ;
+import org.apache.jena.graph.impl.LiteralLabel ;
+import org.apache.jena.graph.impl.LiteralLabelFactory ;
+import org.apache.jena.shared.JenaException ;
+import org.apache.jena.shared.PrefixMapping ;
/**
* Creating nodes from string specifications.
@@ -89,7 +89,7 @@ public class NodeCreateUtils {
if (Character.isDigit(first))
return NodeFactory.createLiteral(x, "", XSDDatatype.XSDinteger);
if (first == '_')
- return NodeFactory.createAnon(new AnonId(x));
+ return NodeFactory.createBlankNode(x);
if (x.equals("??"))
return Node.ANY;
if (first == '?')
http://git-wip-us.apache.org/repos/asf/jena/blob/64e23ff5/jena-core/src/test/java/org/apache/jena/testing_framework/TestFileData.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/org/apache/jena/testing_framework/TestFileData.java b/jena-core/src/test/java/org/apache/jena/testing_framework/TestFileData.java
index da72e42..675df47 100644
--- a/jena-core/src/test/java/org/apache/jena/testing_framework/TestFileData.java
+++ b/jena-core/src/test/java/org/apache/jena/testing_framework/TestFileData.java
@@ -18,26 +18,16 @@
package org.apache.jena.testing_framework;
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.Reader;
-import java.io.StringReader;
-import java.util.HashMap;
-import java.util.Map;
-
-import static org.junit.Assert.assertTrue;
-import org.junit.Test;
-
-import org.apache.jena.graph.Graph;
-import org.apache.jena.graph.NodeFactory;
-import org.apache.jena.graph.Triple;
-import org.apache.jena.rdf.model.AnonId;
-import org.apache.jena.rdf.model.Model;
-import org.apache.jena.rdf.model.ModelFactory;
-import org.apache.jena.graph.Factory;
+import static org.junit.Assert.assertTrue ;
+
+import java.io.* ;
+import java.util.HashMap ;
+import java.util.Map ;
+
+import org.apache.jena.graph.* ;
+import org.apache.jena.rdf.model.Model ;
+import org.apache.jena.rdf.model.ModelFactory ;
+import org.junit.Test ;
/**
* Class that produces RDF and TTL data, a Graph and a Model that all contain
@@ -226,11 +216,11 @@ public class TestFileData {
NodeFactory.createURI("http://example.com/predicate"),
NodeFactory.createURI("http://example.com/object")));
- g.add(new Triple(NodeFactory.createAnon(AnonId.create("a")),
+ g.add(new Triple(NodeFactory.createBlankNode(BlankNodeId.create("a")),
NodeFactory.createURI("http://example.com/p1"), NodeFactory
- .createAnon(AnonId.create("b"))));
+ .createBlankNode(BlankNodeId.create("b"))));
- g.add(new Triple(NodeFactory.createAnon(AnonId.create("b")),
+ g.add(new Triple(NodeFactory.createBlankNode(BlankNodeId.create("b")),
NodeFactory.createURI("http://example.com/p2"), NodeFactory
.createLiteral("foo")));
http://git-wip-us.apache.org/repos/asf/jena/blob/64e23ff5/jena-permissions/src/example/java/org/apache/jena/permissions/example/ExampleEvaluator.java
----------------------------------------------------------------------
diff --git a/jena-permissions/src/example/java/org/apache/jena/permissions/example/ExampleEvaluator.java b/jena-permissions/src/example/java/org/apache/jena/permissions/example/ExampleEvaluator.java
index af57c47..d42ccf8 100644
--- a/jena-permissions/src/example/java/org/apache/jena/permissions/example/ExampleEvaluator.java
+++ b/jena-permissions/src/example/java/org/apache/jena/permissions/example/ExampleEvaluator.java
@@ -17,20 +17,14 @@
*/
package org.apache.jena.permissions.example;
-import java.security.Principal;
-import java.util.Set;
+import java.security.Principal ;
+import java.util.Set ;
-import org.apache.http.auth.BasicUserPrincipal;
-import org.apache.jena.permissions.SecurityEvaluator;
-
-import org.apache.jena.graph.NodeFactory;
-import org.apache.jena.rdf.model.AnonId;
-import org.apache.jena.rdf.model.Model;
-import org.apache.jena.rdf.model.Property;
-import org.apache.jena.rdf.model.RDFNode;
-import org.apache.jena.rdf.model.Resource;
-import org.apache.jena.rdf.model.ResourceFactory;
-import org.apache.jena.vocabulary.RDF;
+import org.apache.http.auth.BasicUserPrincipal ;
+import org.apache.jena.graph.NodeFactory ;
+import org.apache.jena.permissions.SecurityEvaluator ;
+import org.apache.jena.rdf.model.* ;
+import org.apache.jena.vocabulary.RDF ;
/**
* An example evaluator that only provides access to messages in the graph that
@@ -83,7 +77,7 @@ public class ExampleEvaluator implements SecurityEvaluator {
return evaluate( principal, r );
}
else if (node.getType().equals( SecNode.Type.Anonymous)) {
- Resource r = model.getRDFNode( NodeFactory.createAnon( new AnonId( node.getValue()) ) ).asResource();
+ Resource r = model.getRDFNode( NodeFactory.createBlankNode( node.getValue()) ).asResource();
return evaluate( principal, r );
}
else
http://git-wip-us.apache.org/repos/asf/jena/blob/64e23ff5/jena-permissions/src/example/java/org/apache/jena/permissions/example/ShiroExampleEvaluator.java
----------------------------------------------------------------------
diff --git a/jena-permissions/src/example/java/org/apache/jena/permissions/example/ShiroExampleEvaluator.java b/jena-permissions/src/example/java/org/apache/jena/permissions/example/ShiroExampleEvaluator.java
index 4ccc117..db8a2dd 100644
--- a/jena-permissions/src/example/java/org/apache/jena/permissions/example/ShiroExampleEvaluator.java
+++ b/jena-permissions/src/example/java/org/apache/jena/permissions/example/ShiroExampleEvaluator.java
@@ -17,22 +17,16 @@
*/
package org.apache.jena.permissions.example;
-import java.util.Set;
+import java.util.Set ;
-import org.apache.jena.permissions.SecurityEvaluator;
-import org.apache.shiro.SecurityUtils;
-import org.apache.shiro.subject.Subject;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import org.apache.jena.graph.NodeFactory;
-import org.apache.jena.rdf.model.AnonId;
-import org.apache.jena.rdf.model.Model;
-import org.apache.jena.rdf.model.Property;
-import org.apache.jena.rdf.model.RDFNode;
-import org.apache.jena.rdf.model.Resource;
-import org.apache.jena.rdf.model.ResourceFactory;
-import org.apache.jena.vocabulary.RDF;
+import org.apache.jena.graph.NodeFactory ;
+import org.apache.jena.permissions.SecurityEvaluator ;
+import org.apache.jena.rdf.model.* ;
+import org.apache.jena.vocabulary.RDF ;
+import org.apache.shiro.SecurityUtils ;
+import org.apache.shiro.subject.Subject ;
+import org.slf4j.Logger ;
+import org.slf4j.LoggerFactory ;
/**
* Class to use Shiro to provide credentials.
@@ -130,7 +124,7 @@ public class ShiroExampleEvaluator implements SecurityEvaluator {
}
// anonymous nodes have to be retrieved from the model as anonymous nodes.
else if (node.getType().equals( SecNode.Type.Anonymous)) {
- Resource r = model.getRDFNode( NodeFactory.createAnon( new AnonId( node.getValue()) ) ).asResource();
+ Resource r = model.getRDFNode( NodeFactory.createBlankNode( node.getValue()) ).asResource();
return evaluate( principal, r );
}
// anything else (literals) can be seen.
http://git-wip-us.apache.org/repos/asf/jena/blob/64e23ff5/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredResourceImpl.java
----------------------------------------------------------------------
diff --git a/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredResourceImpl.java b/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredResourceImpl.java
index 3a19867..156b5b9 100644
--- a/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredResourceImpl.java
+++ b/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredResourceImpl.java
@@ -72,7 +72,7 @@ public class SecuredResourceImpl extends SecuredRDFNodeImpl implements
final Node n = resource.asNode();
if (resource.isAnon())
{
- goodResource = securedModel.createResource(n.getBlankNodeId());
+ goodResource = securedModel.createResource(new AnonId(n.getBlankNodeId()));
}
else
{
http://git-wip-us.apache.org/repos/asf/jena/blob/64e23ff5/jena-permissions/src/test/java/org/apache/jena/permissions/model/SecuredModelDetailTest.java
----------------------------------------------------------------------
diff --git a/jena-permissions/src/test/java/org/apache/jena/permissions/model/SecuredModelDetailTest.java b/jena-permissions/src/test/java/org/apache/jena/permissions/model/SecuredModelDetailTest.java
index 28b33ba..f93d644 100644
--- a/jena-permissions/src/test/java/org/apache/jena/permissions/model/SecuredModelDetailTest.java
+++ b/jena-permissions/src/test/java/org/apache/jena/permissions/model/SecuredModelDetailTest.java
@@ -17,20 +17,19 @@
*/
package org.apache.jena.permissions.model;
-import java.net.URL;
-import java.security.Principal;
-import java.util.Set;
+import java.net.URL ;
+import java.security.Principal ;
+import java.util.Set ;
-import org.apache.http.auth.BasicUserPrincipal;
+import org.apache.http.auth.BasicUserPrincipal ;
import org.apache.jena.graph.NodeFactory ;
-import org.apache.jena.permissions.Factory;
-import org.apache.jena.permissions.SecurityEvaluator;
-import org.apache.jena.permissions.model.SecuredModel;
+import org.apache.jena.permissions.Factory ;
+import org.apache.jena.permissions.SecurityEvaluator ;
import org.apache.jena.rdf.model.* ;
import org.apache.jena.vocabulary.RDF ;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.Assert ;
+import org.junit.Before ;
+import org.junit.Test ;
/**
* Tests secured model functions against graph where only partial data is
@@ -269,7 +268,7 @@ public class SecuredModelDetailTest {
return evaluate( r );
}
else if (node.getType().equals( SecNode.Type.Anonymous)) {
- Resource r = model.getRDFNode( NodeFactory.createAnon( new AnonId( node.getValue()) ) ).asResource();
+ Resource r = model.getRDFNode( NodeFactory.createBlankNode( node.getValue()) ).asResource();
return evaluate( r );
}
else
http://git-wip-us.apache.org/repos/asf/jena/blob/64e23ff5/jena-sdb/src/main/java/org/apache/jena/sdb/layout1/CodecSimple.java
----------------------------------------------------------------------
diff --git a/jena-sdb/src/main/java/org/apache/jena/sdb/layout1/CodecSimple.java b/jena-sdb/src/main/java/org/apache/jena/sdb/layout1/CodecSimple.java
index e469a25..d51d212 100644
--- a/jena-sdb/src/main/java/org/apache/jena/sdb/layout1/CodecSimple.java
+++ b/jena-sdb/src/main/java/org/apache/jena/sdb/layout1/CodecSimple.java
@@ -20,13 +20,11 @@ package org.apache.jena.sdb.layout1;
import org.apache.jena.graph.Node ;
import org.apache.jena.graph.NodeFactory ;
-import org.apache.jena.rdf.model.AnonId ;
import org.apache.jena.shared.PrefixMapping ;
import org.apache.jena.shared.impl.PrefixMappingImpl ;
import org.apache.jena.sparql.sse.SSE ;
import org.apache.jena.sparql.util.FmtUtils ;
-
public class CodecSimple implements EncoderDecoder
{
private PrefixMapping prefixMapping ;
@@ -52,7 +50,7 @@ public class CodecSimple implements EncoderDecoder
System.err.println(s) ;
if ( s.startsWith("_:") )
- return NodeFactory.createAnon(new AnonId(s.substring(2))) ;
+ return NodeFactory.createBlankNode(s.substring(2)) ;
return stringToNode(s, prefixMapping) ;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/64e23ff5/jena-sdb/src/main/java/org/apache/jena/sdb/layout2/SQLBridge2.java
----------------------------------------------------------------------
diff --git a/jena-sdb/src/main/java/org/apache/jena/sdb/layout2/SQLBridge2.java b/jena-sdb/src/main/java/org/apache/jena/sdb/layout2/SQLBridge2.java
index 91ffa15..cf04a0e 100644
--- a/jena-sdb/src/main/java/org/apache/jena/sdb/layout2/SQLBridge2.java
+++ b/jena-sdb/src/main/java/org/apache/jena/sdb/layout2/SQLBridge2.java
@@ -18,16 +18,15 @@
package org.apache.jena.sdb.layout2;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.Collection;
+import java.sql.ResultSet ;
+import java.sql.SQLException ;
+import java.util.Collection ;
import org.apache.jena.datatypes.RDFDatatype ;
import org.apache.jena.datatypes.TypeMapper ;
import org.apache.jena.datatypes.xsd.XSDDatatype ;
import org.apache.jena.graph.Node ;
import org.apache.jena.graph.NodeFactory ;
-import org.apache.jena.rdf.model.AnonId ;
import org.apache.jena.sdb.compiler.SqlBuilder ;
import org.apache.jena.sdb.core.AliasesSql ;
import org.apache.jena.sdb.core.SDBRequest ;
@@ -45,8 +44,8 @@ import org.apache.jena.sparql.core.Var ;
import org.apache.jena.sparql.engine.binding.Binding ;
import org.apache.jena.sparql.engine.binding.BindingFactory ;
import org.apache.jena.sparql.engine.binding.BindingMap ;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.slf4j.Logger ;
+import org.slf4j.LoggerFactory ;
public class SQLBridge2 extends SQLBridgeBase
{
@@ -234,7 +233,7 @@ public class SQLBridge2 extends SQLBridgeBase
switch (vType)
{
case BNODE:
- return NodeFactory.createAnon(new AnonId(lex)) ;
+ return NodeFactory.createBlankNode(lex) ;
case URI:
return NodeFactory.createURI(lex) ;
case STRING:
http://git-wip-us.apache.org/repos/asf/jena/blob/64e23ff5/jena-spatial/src/main/java/org/apache/jena/query/spatial/SpatialQueryFuncs.java
----------------------------------------------------------------------
diff --git a/jena-spatial/src/main/java/org/apache/jena/query/spatial/SpatialQueryFuncs.java b/jena-spatial/src/main/java/org/apache/jena/query/spatial/SpatialQueryFuncs.java
index 34b2fe9..48011c1 100644
--- a/jena-spatial/src/main/java/org/apache/jena/query/spatial/SpatialQueryFuncs.java
+++ b/jena-spatial/src/main/java/org/apache/jena/query/spatial/SpatialQueryFuncs.java
@@ -20,7 +20,6 @@ package org.apache.jena.query.spatial;
import org.apache.jena.graph.Node ;
import org.apache.jena.graph.NodeFactory ;
-import org.apache.jena.rdf.model.AnonId ;
public class SpatialQueryFuncs {
@@ -50,7 +49,7 @@ public class SpatialQueryFuncs {
public static Node stringToNode(String v) {
if ( v.startsWith("_:") ) {
v = v.substring("_:".length()) ;
- return NodeFactory.createAnon(new AnonId(v)) ;
+ return NodeFactory.createBlankNode(v) ;
}
else
return NodeFactory.createURI(v) ;
http://git-wip-us.apache.org/repos/asf/jena/blob/64e23ff5/jena-tdb/src/main/java/org/apache/jena/tdb/store/nodetable/NodecLib.java
----------------------------------------------------------------------
diff --git a/jena-tdb/src/main/java/org/apache/jena/tdb/store/nodetable/NodecLib.java b/jena-tdb/src/main/java/org/apache/jena/tdb/store/nodetable/NodecLib.java
index 49be0ec..d602388 100644
--- a/jena-tdb/src/main/java/org/apache/jena/tdb/store/nodetable/NodecLib.java
+++ b/jena-tdb/src/main/java/org/apache/jena/tdb/store/nodetable/NodecLib.java
@@ -22,7 +22,6 @@ import org.apache.jena.atlas.lib.StrUtils ;
import org.apache.jena.atlas.logging.Log ;
import org.apache.jena.graph.Node ;
import org.apache.jena.graph.NodeFactory ;
-import org.apache.jena.rdf.model.AnonId ;
import org.apache.jena.riot.out.NodeFmtLib ;
import org.apache.jena.shared.PrefixMapping ;
import org.apache.jena.sparql.sse.SSE ;
@@ -70,7 +69,7 @@ public class NodecLib
if ( s.startsWith("_:") )
{
s = s.substring(2) ;
- return NodeFactory.createAnon(new AnonId(s)) ;
+ return NodeFactory.createBlankNode(s) ;
}
if ( s.startsWith("<") )
http://git-wip-us.apache.org/repos/asf/jena/blob/64e23ff5/jena-tdb/src/main/java/org/apache/jena/tdb/store/nodetable/NodecSSE.java
----------------------------------------------------------------------
diff --git a/jena-tdb/src/main/java/org/apache/jena/tdb/store/nodetable/NodecSSE.java b/jena-tdb/src/main/java/org/apache/jena/tdb/store/nodetable/NodecSSE.java
index c808f97..1b7febb 100644
--- a/jena-tdb/src/main/java/org/apache/jena/tdb/store/nodetable/NodecSSE.java
+++ b/jena-tdb/src/main/java/org/apache/jena/tdb/store/nodetable/NodecSSE.java
@@ -24,7 +24,6 @@ import org.apache.jena.atlas.io.BlockUTF8 ;
import org.apache.jena.atlas.lib.StrUtils ;
import org.apache.jena.graph.Node ;
import org.apache.jena.graph.NodeFactory ;
-import org.apache.jena.rdf.model.AnonId ;
import org.apache.jena.riot.RiotException ;
import org.apache.jena.riot.out.NodeFmtLib ;
import org.apache.jena.riot.system.PrefixMap ;
@@ -111,7 +110,7 @@ public class NodecSSE implements Nodec
// In particular, bnode labels can contain ":" from Jena
// TokenizerText does not recognize these.
str = str.substring(2) ;
- return NodeFactory.createAnon(new AnonId(str)) ;
+ return NodeFactory.createBlankNode(str) ;
}
if ( str.startsWith("<") )
http://git-wip-us.apache.org/repos/asf/jena/blob/64e23ff5/jena-tdb/src/test/java/org/apache/jena/tdb/store/nodetable/TestCodec.java
----------------------------------------------------------------------
diff --git a/jena-tdb/src/test/java/org/apache/jena/tdb/store/nodetable/TestCodec.java b/jena-tdb/src/test/java/org/apache/jena/tdb/store/nodetable/TestCodec.java
index d4c2dd8..cf2e670 100644
--- a/jena-tdb/src/test/java/org/apache/jena/tdb/store/nodetable/TestCodec.java
+++ b/jena-tdb/src/test/java/org/apache/jena/tdb/store/nodetable/TestCodec.java
@@ -25,10 +25,7 @@ import java.util.Collection ;
import org.apache.jena.atlas.junit.BaseTest ;
import org.apache.jena.atlas.lib.ByteBufferLib ;
import org.apache.jena.graph.Node ;
-import org.apache.jena.rdf.model.AnonId ;
import org.apache.jena.sparql.util.NodeFactoryExtra ;
-import org.apache.jena.tdb.store.nodetable.Nodec ;
-import org.apache.jena.tdb.store.nodetable.NodecSSE ;
import org.junit.Test ;
import org.junit.runner.RunWith ;
import org.junit.runners.Parameterized ;
@@ -98,9 +95,9 @@ public class TestCodec extends BaseTest
@Test public void nodec_uri_02() { test ("<http://example/>") ; }
// Jena anon ids can have a string form including ":"
- @Test public void nodec_blank_01() { test (org.apache.jena.graph.NodeFactory.createAnon(new AnonId("a"))) ; }
- @Test public void nodec_blank_02() { test (org.apache.jena.graph.NodeFactory.createAnon(new AnonId("a:b:c-d"))) ; }
- @Test public void nodec_blank_03() { test (org.apache.jena.graph.NodeFactory.createAnon()) ; }
+ @Test public void nodec_blank_01() { test (org.apache.jena.graph.NodeFactory.createBlankNode("a")) ; }
+ @Test public void nodec_blank_02() { test (org.apache.jena.graph.NodeFactory.createBlankNode("a:b:c-d")) ; }
+ @Test public void nodec_blank_03() { test (org.apache.jena.graph.NodeFactory.createBlankNode()) ; }
private void test(String sseString)
{
http://git-wip-us.apache.org/repos/asf/jena/blob/64e23ff5/jena-text/src/main/java/org/apache/jena/query/text/TextQueryFuncs.java
----------------------------------------------------------------------
diff --git a/jena-text/src/main/java/org/apache/jena/query/text/TextQueryFuncs.java b/jena-text/src/main/java/org/apache/jena/query/text/TextQueryFuncs.java
index 7854726..21a9d3c 100644
--- a/jena-text/src/main/java/org/apache/jena/query/text/TextQueryFuncs.java
+++ b/jena-text/src/main/java/org/apache/jena/query/text/TextQueryFuncs.java
@@ -19,10 +19,9 @@
package org.apache.jena.query.text;
import org.apache.jena.atlas.logging.Log ;
-import org.apache.jena.datatypes.RDFDatatype;
+import org.apache.jena.datatypes.RDFDatatype ;
import org.apache.jena.graph.Node ;
import org.apache.jena.graph.NodeFactory ;
-import org.apache.jena.rdf.model.AnonId ;
import org.apache.jena.sparql.core.Quad ;
import org.apache.jena.sparql.util.FmtUtils ;
@@ -55,7 +54,7 @@ public class TextQueryFuncs {
public static Node stringToNode(String v) {
if ( v.startsWith("_:") ) {
v = v.substring("_:".length()) ;
- return NodeFactory.createAnon(new AnonId(v)) ;
+ return NodeFactory.createBlankNode(v) ;
}
else
return NodeFactory.createURI(v) ;
http://git-wip-us.apache.org/repos/asf/jena/blob/64e23ff5/jena-text/src/main/java/org/apache/jena/query/text/TextQueryPF.java
----------------------------------------------------------------------
diff --git a/jena-text/src/main/java/org/apache/jena/query/text/TextQueryPF.java b/jena-text/src/main/java/org/apache/jena/query/text/TextQueryPF.java
index 3a0b214..386e559 100644
--- a/jena-text/src/main/java/org/apache/jena/query/text/TextQueryPF.java
+++ b/jena-text/src/main/java/org/apache/jena/query/text/TextQueryPF.java
@@ -35,7 +35,6 @@ import org.apache.jena.sparql.engine.QueryIterator ;
import org.apache.jena.sparql.engine.binding.Binding ;
import org.apache.jena.sparql.engine.binding.BindingFactory ;
import org.apache.jena.sparql.engine.binding.BindingMap ;
-import org.apache.jena.sparql.engine.iterator.QueryIterExtendByVar ;
import org.apache.jena.sparql.engine.iterator.QueryIterPlainWrapper ;
import org.apache.jena.sparql.engine.iterator.QueryIterSlice ;
import org.apache.jena.sparql.mgt.Explain ;
@@ -229,9 +228,7 @@ public class TextQueryPF extends PropertyFunctionBase {
if (scoreVar != null) {
bmap.add(scoreVar, NodeFactoryExtra.floatToNode(hit.getScore()));
}
- if (literalVar != null) {
- bmap.add(literalVar, hit.getLiteral());
- }
+ bmap.add(literalVar, hit.getLiteral());
return IterLib.result(bmap, execCxt) ;
}
}
[8/8] jena git commit: BlankNodeId as system identifier for blank
nodes; AnonId at RDF API level.
Posted by an...@apache.org.
BlankNodeId as system identifier for blank nodes; AnonId at RDF API level.
Merge commit 'refs/pull/86/head' of github.com:apache/jena
JENA-986
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/5799250b
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/5799250b
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/5799250b
Branch: refs/heads/master
Commit: 5799250b4fdca7c612331ca536e44f35d95a4ed5
Parents: 843f54c 43ade4a
Author: Andy Seaborne <an...@apache.org>
Authored: Tue Jul 14 14:43:28 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Tue Jul 14 14:43:28 2015 +0100
----------------------------------------------------------------------
.../jena/riot/checker/CheckerVisitor.java | 3 +-
.../jena/riot/lang/BlankNodeAllocatorHash.java | 3 +-
.../jena/riot/lang/BlankNodeAllocatorLabel.java | 3 +-
.../lang/BlankNodeAllocatorLabelEncoded.java | 5 +-
.../lang/BlankNodeAllocatorTraditional.java | 2 +-
.../java/org/apache/jena/riot/lang/LangCSV.java | 2 +-
.../org/apache/jena/riot/lang/LangRDFXML.java | 2 +-
.../apache/jena/riot/lang/LangTurtleBase.java | 2 +-
.../org/apache/jena/riot/system/RiotLib.java | 3 +-
.../apache/jena/riot/thrift/ThriftConvert.java | 3 +-
.../java/org/apache/jena/riot/tokens/Token.java | 27 +---
.../engine/binding/BindingInputStream.java | 3 +-
.../org/apache/jena/sparql/expr/E_BNode.java | 2 +-
.../org/apache/jena/sparql/expr/NodeValue.java | 29 +---
.../apache/jena/sparql/modify/TemplateLib.java | 2 +-
.../sparql/resultset/JSONInputIterator.java | 28 ++--
.../jena/sparql/resultset/XMLInputStAX.java | 3 +-
.../jena/sparql/sse/lang/ParseHandlerPlain.java | 2 +-
.../apache/jena/sparql/util/LabelToNodeMap.java | 2 +-
.../jena/sparql/util/graph/GraphList.java | 4 +-
.../jena/atlas/data/TestDistinctDataBag.java | 6 +-
.../jena/atlas/data/TestDistinctDataNet.java | 6 +-
.../jena/atlas/data/TestSortedDataBag.java | 6 +-
.../jena/riot/lang/TestCollectorStream.java | 4 +-
.../apache/jena/riot/lang/TestNodeToLabel.java | 6 +-
.../jena/riot/lang/TestPipedRDFIterators.java | 4 +-
.../apache/jena/riot/thrift/TestThriftTerm.java | 5 +-
.../jena/riot/tokens/TestTokenForNode.java | 3 +-
.../apache/jena/riot/writer/TestRDFJSON.java | 2 +-
.../sparql/core/AbstractDatasetGraphTests.java | 6 +-
.../engine/binding/TestBindingStreams.java | 3 +-
.../engine/iterator/TestQueryIterSort.java | 6 +-
.../jena/sparql/expr/TestExpressions.java | 2 +-
.../jena/sparql/expr/TestNodeFunctions.java | 6 +-
.../apache/jena/sparql/expr/TestOrdering.java | 2 +-
.../apache/jena/sparql/expr/TestXSDFuncOp.java | 8 +-
.../sparql/modify/AbstractTestUpdateGraph.java | 8 +-
.../apache/jena/sparql/util/TestFmtUtils.java | 8 +-
.../java/org/apache/jena/graph/BlankNodeId.java | 156 +++++++++++++++++++
.../main/java/org/apache/jena/graph/Node.java | 34 ++--
.../java/org/apache/jena/graph/NodeFactory.java | 49 ++++--
.../java/org/apache/jena/graph/NodeVisitor.java | 5 +-
.../java/org/apache/jena/graph/Node_Blank.java | 12 +-
.../org/apache/jena/graph/Node_Literal.java | 5 +
.../java/org/apache/jena/graph/Node_URI.java | 5 +
.../org/apache/jena/graph/Node_Variable.java | 1 +
.../apache/jena/n3/turtle/LabelToNodeMap.java | 2 +-
.../org/apache/jena/n3/turtle/ParserBase.java | 3 +-
.../java/org/apache/jena/rdf/model/AnonId.java | 121 ++++++--------
.../apache/jena/rdf/model/impl/ModelCom.java | 4 +-
.../apache/jena/rdf/model/impl/ReifierStd.java | 2 +-
.../jena/rdf/model/impl/ResourceImpl.java | 13 +-
.../apache/jena/rdfxml/xmlinput/JenaReader.java | 2 +-
.../jena/reasoner/rulesys/FBRuleInfGraph.java | 2 +-
.../org/apache/jena/reasoner/rulesys/Rule.java | 19 +--
.../org/apache/jena/reasoner/rulesys/Util.java | 2 +-
.../reasoner/rulesys/builtins/MakeSkolem.java | 10 +-
.../reasoner/rulesys/builtins/MakeTemp.java | 2 +-
.../reasoner/rulesys/impl/BindingStack.java | 6 +-
.../reasoner/rulesys/impl/BindingVector.java | 6 +-
.../rulesys/impl/LPBindingEnvironment.java | 6 +-
.../reasoner/rulesys/impl/TempNodeCache.java | 2 +-
.../apache/jena/enhanced/test/TestPackage.java | 2 +-
.../jena/graph/test/AbstractTestReifier.java | 2 +-
.../apache/jena/graph/test/NodeCreateUtils.java | 4 +-
.../org/apache/jena/graph/test/TestNode.java | 46 +++---
.../org/apache/jena/graph/test/TestTriple.java | 7 +-
.../jena/rdfxml/xmloutput/TestXMLFeatures.java | 2 +-
.../jena/reasoner/rulesys/test/TestBugs.java | 4 +-
.../jena/reasoner/rulesys/test/TestFBRules.java | 2 +-
.../jena/testing_framework/NodeCreateUtils.java | 20 +--
.../jena/testing_framework/TestFileData.java | 36 ++---
.../permissions/example/ExampleEvaluator.java | 22 +--
.../example/ShiroExampleEvaluator.java | 26 ++--
.../model/impl/SecuredResourceImpl.java | 2 +-
.../model/SecuredModelDetailTest.java | 21 ++-
.../apache/jena/sdb/layout1/CodecSimple.java | 4 +-
.../org/apache/jena/sdb/layout2/SQLBridge2.java | 13 +-
.../jena/query/spatial/SpatialQueryFuncs.java | 3 +-
.../jena/tdb/store/nodetable/NodecLib.java | 3 +-
.../jena/tdb/store/nodetable/NodecSSE.java | 3 +-
.../jena/tdb/store/nodetable/TestCodec.java | 9 +-
.../apache/jena/query/text/TextQueryFuncs.java | 5 +-
.../org/apache/jena/query/text/TextQueryPF.java | 5 +-
84 files changed, 509 insertions(+), 422 deletions(-)
----------------------------------------------------------------------