createAnon -> createBlankNode Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/65e7b0f0 Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/65e7b0f0 Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/65e7b0f0
Branch: refs/heads/master Commit: 65e7b0f0eb642d9fece646cc3548c812943144df Parents: a38e1ec Author: Andy Seaborne <[email protected]> Authored: Sat Mar 5 13:58:45 2016 +0000 Committer: Andy Seaborne <[email protected]> Committed: Sat Mar 5 13:58:45 2016 +0000 ---------------------------------------------------------------------- .../java/org/apache/jena/propertytable/lang/LangCSV.java | 2 +- .../org/apache/jena/propertytable/AbstractColumnTest.java | 4 ++-- .../jena/propertytable/AbstractPropertyTableTest.java | 8 ++++---- .../org/apache/jena/propertytable/AbstractRowTest.java | 8 ++++---- .../org/apache/jena/hadoop/rdf/io/types/RdfTypesTest.java | 8 ++++---- .../rdf/io/input/bnodes/AbstractBlankNodeTests.java | 10 +++++----- 6 files changed, 20 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jena/blob/65e7b0f0/jena-csv/src/main/java/org/apache/jena/propertytable/lang/LangCSV.java ---------------------------------------------------------------------- diff --git a/jena-csv/src/main/java/org/apache/jena/propertytable/lang/LangCSV.java b/jena-csv/src/main/java/org/apache/jena/propertytable/lang/LangCSV.java index 16fde2e..bd2ff29 100644 --- a/jena-csv/src/main/java/org/apache/jena/propertytable/lang/LangCSV.java +++ b/jena-csv/src/main/java/org/apache/jena/propertytable/lang/LangCSV.java @@ -146,7 +146,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/65e7b0f0/jena-csv/src/test/java/org/apache/jena/propertytable/AbstractColumnTest.java ---------------------------------------------------------------------- diff --git a/jena-csv/src/test/java/org/apache/jena/propertytable/AbstractColumnTest.java b/jena-csv/src/test/java/org/apache/jena/propertytable/AbstractColumnTest.java index 05a7527..a41161e 100644 --- a/jena-csv/src/test/java/org/apache/jena/propertytable/AbstractColumnTest.java +++ b/jena-csv/src/test/java/org/apache/jena/propertytable/AbstractColumnTest.java @@ -53,9 +53,9 @@ public abstract class AbstractColumnTest extends BaseTest{ @Test public void testGetColumnValues() { Column something = table.createColumn(URI("something")); - final Row row1 = table.createRow(NodeFactory.createAnon()); + final Row row1 = table.createRow(NodeFactory.createBlankNode()); row1.setValue(something, URI("apple")); - final Row row2 = table.createRow(NodeFactory.createAnon()); + final Row row2 = table.createRow(NodeFactory.createBlankNode()); row2.setValue(something, URI("orange")); final List<Node> values = something.getValues(); Assert.assertTrue(values.size() == 2); http://git-wip-us.apache.org/repos/asf/jena/blob/65e7b0f0/jena-csv/src/test/java/org/apache/jena/propertytable/AbstractPropertyTableTest.java ---------------------------------------------------------------------- diff --git a/jena-csv/src/test/java/org/apache/jena/propertytable/AbstractPropertyTableTest.java b/jena-csv/src/test/java/org/apache/jena/propertytable/AbstractPropertyTableTest.java index 452dd5c..5209361 100644 --- a/jena-csv/src/test/java/org/apache/jena/propertytable/AbstractPropertyTableTest.java +++ b/jena-csv/src/test/java/org/apache/jena/propertytable/AbstractPropertyTableTest.java @@ -33,9 +33,9 @@ public abstract class AbstractPropertyTableTest extends AbstractRowTest{ @Test public void testGetMatchingColumns() { Column something = table.createColumn(URI("something") ); - final Row row1 = table.createRow(NodeFactory.createAnon()); + final Row row1 = table.createRow(NodeFactory.createBlankNode()); row1.setValue(something, URI("apple")); - final Row row2 = table.createRow(NodeFactory.createAnon()); + final Row row2 = table.createRow(NodeFactory.createBlankNode()); row2.setValue(something, URI("orange")); Collection<Row> matchingRows = table.getMatchingRows(something, URI("apple")); Assert.assertTrue(matchingRows.size() == 1); @@ -46,9 +46,9 @@ public abstract class AbstractPropertyTableTest extends AbstractRowTest{ @Test public void testGetAllRows() { Assert.assertTrue(table.getAllRows().size() == 1); - table.createRow(NodeFactory.createAnon()); + table.createRow(NodeFactory.createBlankNode()); Assert.assertTrue(table.getAllRows().size() == 2); - table.createRow(NodeFactory.createAnon()); + table.createRow(NodeFactory.createBlankNode()); Assert.assertTrue(table.getAllRows().size() == 3); } http://git-wip-us.apache.org/repos/asf/jena/blob/65e7b0f0/jena-csv/src/test/java/org/apache/jena/propertytable/AbstractRowTest.java ---------------------------------------------------------------------- diff --git a/jena-csv/src/test/java/org/apache/jena/propertytable/AbstractRowTest.java b/jena-csv/src/test/java/org/apache/jena/propertytable/AbstractRowTest.java index e202af4..3e16033 100644 --- a/jena-csv/src/test/java/org/apache/jena/propertytable/AbstractRowTest.java +++ b/jena-csv/src/test/java/org/apache/jena/propertytable/AbstractRowTest.java @@ -65,7 +65,7 @@ public abstract class AbstractRowTest extends AbstractColumnTest{ @Test(expected=IllegalArgumentException.class) public void testGetListWithANonExistantColumn() { - Assert.assertNull(row.getValue( NodeFactory.createAnon() )); + Assert.assertNull(row.getValue( NodeFactory.createBlankNode() )); } @Test @@ -84,7 +84,7 @@ public abstract class AbstractRowTest extends AbstractColumnTest{ @Test public void testRowExistsFalse(){ - Assert.assertNull(table.getRow(NodeFactory.createAnon())); + Assert.assertNull(table.getRow(NodeFactory.createBlankNode())); } @Test @@ -94,8 +94,8 @@ public abstract class AbstractRowTest extends AbstractColumnTest{ @Test public void testGetRowFalseAndDoesntCreateRow() { - Assert.assertNull(table.getRow(NodeFactory.createAnon())); - Assert.assertNull(table.getRow(NodeFactory.createAnon())); + Assert.assertNull(table.getRow(NodeFactory.createBlankNode())); + Assert.assertNull(table.getRow(NodeFactory.createBlankNode())); } @Test(expected=IllegalArgumentException.class) http://git-wip-us.apache.org/repos/asf/jena/blob/65e7b0f0/jena-elephas/jena-elephas-common/src/test/java/org/apache/jena/hadoop/rdf/io/types/RdfTypesTest.java ---------------------------------------------------------------------- diff --git a/jena-elephas/jena-elephas-common/src/test/java/org/apache/jena/hadoop/rdf/io/types/RdfTypesTest.java b/jena-elephas/jena-elephas-common/src/test/java/org/apache/jena/hadoop/rdf/io/types/RdfTypesTest.java index 9918f2b..e51ab6a 100644 --- a/jena-elephas/jena-elephas-common/src/test/java/org/apache/jena/hadoop/rdf/io/types/RdfTypesTest.java +++ b/jena-elephas/jena-elephas-common/src/test/java/org/apache/jena/hadoop/rdf/io/types/RdfTypesTest.java @@ -296,7 +296,7 @@ public class RdfTypesTest { */ @Test public void node_writable_bnode_01() throws IOException, InstantiationException, IllegalAccessException, ClassNotFoundException { - Node n = NodeFactory.createAnon(); + Node n = NodeFactory.createBlankNode(); NodeWritable nw = new NodeWritable(n); testWriteRead(nw, nw); } @@ -311,7 +311,7 @@ public class RdfTypesTest { */ @Test public void node_writable_bnode_02() throws IOException, InstantiationException, IllegalAccessException, ClassNotFoundException { - Node n = NodeFactory.createAnon(); + Node n = NodeFactory.createBlankNode(); NodeWritable nw = new NodeWritable(n); testWriteRead(nw, nw); NodeWritable nw2 = new NodeWritable(n); @@ -345,7 +345,7 @@ public class RdfTypesTest { */ @Test public void triple_writable_02() throws IOException, InstantiationException, IllegalAccessException, ClassNotFoundException { - Triple t = new Triple(NodeFactory.createAnon(), NodeFactory.createURI("http://predicate";), NodeFactory.createLiteral("value")); + Triple t = new Triple(NodeFactory.createBlankNode(), NodeFactory.createURI("http://predicate";), NodeFactory.createLiteral("value")); TripleWritable tw = new TripleWritable(t); testWriteRead(tw, tw); } @@ -376,7 +376,7 @@ public class RdfTypesTest { */ @Test public void quad_writable_02() throws IOException, InstantiationException, IllegalAccessException, ClassNotFoundException { - Quad q = new Quad(Quad.defaultGraphNodeGenerated, NodeFactory.createAnon(), NodeFactory.createURI("http://predicate";), + Quad q = new Quad(Quad.defaultGraphNodeGenerated, NodeFactory.createBlankNode(), NodeFactory.createURI("http://predicate";), NodeFactory.createLiteral("value")); QuadWritable qw = new QuadWritable(q); testWriteRead(qw, qw); http://git-wip-us.apache.org/repos/asf/jena/blob/65e7b0f0/jena-elephas/jena-elephas-io/src/test/java/org/apache/jena/hadoop/rdf/io/input/bnodes/AbstractBlankNodeTests.java ---------------------------------------------------------------------- diff --git a/jena-elephas/jena-elephas-io/src/test/java/org/apache/jena/hadoop/rdf/io/input/bnodes/AbstractBlankNodeTests.java b/jena-elephas/jena-elephas-io/src/test/java/org/apache/jena/hadoop/rdf/io/input/bnodes/AbstractBlankNodeTests.java index 16dc15b..93d8fb8 100644 --- a/jena-elephas/jena-elephas-io/src/test/java/org/apache/jena/hadoop/rdf/io/input/bnodes/AbstractBlankNodeTests.java +++ b/jena-elephas/jena-elephas-io/src/test/java/org/apache/jena/hadoop/rdf/io/input/bnodes/AbstractBlankNodeTests.java @@ -177,7 +177,7 @@ public abstract class AbstractBlankNodeTests<T, TValue extends AbstractNodeTuple // Prepare the input data // Two mentions of the same blank node in the same file List<T> tuples = new ArrayList<>(); - Node bnode = NodeFactory.createAnon(); + Node bnode = NodeFactory.createBlankNode(); Node pred = NodeFactory.createURI("http://example.org/predicate";); tuples.add(createTuple(bnode, pred, NodeFactory.createLiteral("first"))); tuples.add(createTuple(bnode, pred, NodeFactory.createLiteral("second"))); @@ -286,7 +286,7 @@ public abstract class AbstractBlankNodeTests<T, TValue extends AbstractNodeTuple // Prepare the input data // Two mentions of the same blank node in the same file List<T> tuples = new ArrayList<>(); - Node bnode = NodeFactory.createAnon(); + Node bnode = NodeFactory.createBlankNode(); Node pred = NodeFactory.createURI("http://example.org/predicate";); tuples.add(createTuple(bnode, pred, NodeFactory.createLiteral("first"))); tuples.add(createTuple(bnode, pred, NodeFactory.createLiteral("second"))); @@ -397,8 +397,8 @@ public abstract class AbstractBlankNodeTests<T, TValue extends AbstractNodeTuple // Prepare the input data // Different blank nodes in different files List<T> tuples = new ArrayList<>(); - Node bnode1 = NodeFactory.createAnon(); - Node bnode2 = NodeFactory.createAnon(); + Node bnode1 = NodeFactory.createBlankNode(); + Node bnode2 = NodeFactory.createBlankNode(); Node pred = NodeFactory.createURI("http://example.org/predicate";); tuples.add(createTuple(bnode1, pred, NodeFactory.createLiteral("first"))); @@ -507,7 +507,7 @@ public abstract class AbstractBlankNodeTests<T, TValue extends AbstractNodeTuple // Same blank node but in different files so must be treated as // different blank nodes and not converge List<T> tuples = new ArrayList<>(); - Node bnode = NodeFactory.createAnon(); + Node bnode = NodeFactory.createBlankNode(); Node pred = NodeFactory.createURI("http://example.org/predicate";); tuples.add(createTuple(bnode, pred, NodeFactory.createLiteral("first")));
