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:30 UTC
[5/8] jena git commit: Changes for AnonId/BlankNodeId and
createAnon->createBlankNode.
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) ;
}
}