JENA-815 : Add create(lex,lang) form without XML flag. Replace uses of create(lex,lang,false) with a call to this new method.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/a226343a Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/a226343a Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/a226343a Branch: refs/heads/hadoop-rdf Commit: a226343a9735def593f1acdf5e52914da884e690 Parents: f6e1db0 Author: Andy Seaborne <a...@apache.org> Authored: Sat Nov 22 15:30:29 2014 +0000 Committer: Andy Seaborne <a...@apache.org> Committed: Sat Nov 22 15:30:29 2014 +0000 ---------------------------------------------------------------------- .../java/com/hp/hpl/jena/graph/NodeFactory.java | 17 ++++++++++++++++- .../com/hp/hpl/jena/rdf/model/ResourceFactory.java | 4 ++-- .../com/hp/hpl/jena/rdf/model/SimpleSelector.java | 2 +- .../com/hp/hpl/jena/rdf/model/impl/AltImpl.java | 2 +- .../hp/hpl/jena/rdf/model/impl/ContainerImpl.java | 2 +- .../com/hp/hpl/jena/rdf/model/impl/ModelCom.java | 2 +- .../com/hp/hpl/jena/rdf/model/impl/SeqImpl.java | 2 +- .../hp/hpl/jena/rdf/model/impl/StatementBase.java | 9 +++------ .../hp/hpl/jena/rdfxml/xmlinput/JenaReader.java | 2 +- .../com/hp/hpl/jena/reasoner/rulesys/Rule.java | 4 ++-- .../java/com/hp/hpl/jena/graph/test/TestNode.java | 4 ++-- .../jena/reasoner/rulesys/test/TestFBRules.java | 2 +- 12 files changed, 32 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jena/blob/a226343a/jena-core/src/main/java/com/hp/hpl/jena/graph/NodeFactory.java ---------------------------------------------------------------------- diff --git a/jena-core/src/main/java/com/hp/hpl/jena/graph/NodeFactory.java b/jena-core/src/main/java/com/hp/hpl/jena/graph/NodeFactory.java index e62bab5..59f3b2e 100644 --- a/jena-core/src/main/java/com/hp/hpl/jena/graph/NodeFactory.java +++ b/jena-core/src/main/java/com/hp/hpl/jena/graph/NodeFactory.java @@ -55,7 +55,9 @@ public class NodeFactory { return createLiteral( value, "", false ); } /** make a literal with specified language and XMLishness. - _lit_ must *not* be null. + lexical form must not be null. + @param lex + @param lang @param isXml If true then lit is exclusive canonical XML of type rdf:XMLLiteral, and no checking will be invoked. */ @@ -65,6 +67,19 @@ public class NodeFactory return createLiteral( LiteralLabelFactory.create( lex, lang, isXml ) ); } + /** Make a literal with specified language. + lexical form must not be null. + @param lex + @param lang + */ + public static Node createLiteral( String lex, String lang) + { + // Equivalent to create(lex, lang, false) except the XML flag is + // hidden so client code does not see it unnecesarily. + if (lex == null) throw new NullPointerException( "null lexical form for literal" ); + return createLiteral( LiteralLabelFactory.create( lex, lang) ); + } + /** * Build a literal node from its lexical form. The * lexical form will be parsed now and the value stored. If http://git-wip-us.apache.org/repos/asf/jena/blob/a226343a/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/ResourceFactory.java ---------------------------------------------------------------------- diff --git a/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/ResourceFactory.java b/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/ResourceFactory.java index 2a47310..5f393ad 100644 --- a/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/ResourceFactory.java +++ b/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/ResourceFactory.java @@ -265,12 +265,12 @@ public class ResourceFactory { @Override public Literal createPlainLiteral( String string ) { - return new LiteralImpl( NodeFactory.createLiteral( string, "", false ), null ); + return new LiteralImpl( NodeFactory.createLiteral( string, "" ), null ); } @Override public Literal createLangLiteral( String string , String lang ) { - return new LiteralImpl( NodeFactory.createLiteral( string, lang, false ), null ); + return new LiteralImpl( NodeFactory.createLiteral( string, lang ), null ); } @Override http://git-wip-us.apache.org/repos/asf/jena/blob/a226343a/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/SimpleSelector.java ---------------------------------------------------------------------- diff --git a/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/SimpleSelector.java b/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/SimpleSelector.java index ee67a3f..70cbccf 100644 --- a/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/SimpleSelector.java +++ b/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/SimpleSelector.java @@ -207,7 +207,7 @@ public class SimpleSelector extends Object implements Selector { } private Literal literal( String s, String lang ) - { return new LiteralImpl( NodeFactory.createLiteral( s, lang, false ), (ModelCom) null ); } + { return new LiteralImpl( NodeFactory.createLiteral( s, lang ), (ModelCom) null ); } /** Create a selector. A model <b>may</b> restrict statements that are tested using * the <CODE>selects</CODE> method to those whose subject matches the http://git-wip-us.apache.org/repos/asf/jena/blob/a226343a/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/AltImpl.java ---------------------------------------------------------------------- diff --git a/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/AltImpl.java b/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/AltImpl.java index 4e31ff3..bffb3cf 100644 --- a/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/AltImpl.java +++ b/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/AltImpl.java @@ -193,7 +193,7 @@ public class AltImpl extends ContainerImpl implements Alt { @Override public Alt setDefault(String o, String l) { - return setDefault( new LiteralImpl( NodeFactory.createLiteral( o,l, false ), getModelCom()) ); + return setDefault( new LiteralImpl( NodeFactory.createLiteral( o, l ), getModelCom()) ); } protected Statement getDefaultStatement() http://git-wip-us.apache.org/repos/asf/jena/blob/a226343a/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/ContainerImpl.java ---------------------------------------------------------------------- diff --git a/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/ContainerImpl.java b/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/ContainerImpl.java index 978f7ec..01a7347 100644 --- a/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/ContainerImpl.java +++ b/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/ContainerImpl.java @@ -172,7 +172,7 @@ public class ContainerImpl extends ResourceImpl } private Literal literal( String s, String lang ) - { return new LiteralImpl( NodeFactory.createLiteral( s, lang, false ), getModelCom() ); } + { return new LiteralImpl( NodeFactory.createLiteral( s, lang ), getModelCom() ); } @Override public NodeIterator iterator() http://git-wip-us.apache.org/repos/asf/jena/blob/a226343a/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/ModelCom.java ---------------------------------------------------------------------- diff --git a/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/ModelCom.java b/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/ModelCom.java index 587388f..d59edbc 100644 --- a/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/ModelCom.java +++ b/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/ModelCom.java @@ -479,7 +479,7 @@ implements Model, PrefixMapping, Lock if (O != null) { // this is not OK when L is null: returns only the statements whose lang is "" // return listStatements( S, P, Node.createLiteral( O, L, false ) ); - if (L != null) return listStatements( S, P, NodeFactory.createLiteral( O, L, false ) ); + if (L != null) return listStatements( S, P, NodeFactory.createLiteral( O, L ) ); // there's maybe a better way return new StringFilteredStmtIterator(O, listStatements(S, P, Node.ANY)); } else { http://git-wip-us.apache.org/repos/asf/jena/blob/a226343a/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/SeqImpl.java ---------------------------------------------------------------------- diff --git a/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/SeqImpl.java b/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/SeqImpl.java index 3575641..234a1c3 100644 --- a/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/SeqImpl.java +++ b/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/SeqImpl.java @@ -348,7 +348,7 @@ public class SeqImpl extends ContainerImpl implements Seq { } private Literal literal( String s, String lang ) - { return new LiteralImpl( NodeFactory.createLiteral( s, lang, false ), getModelCom() ); } + { return new LiteralImpl( NodeFactory.createLiteral( s, lang ), getModelCom() ); } protected void shiftUp(int start, int finish) { Statement stmt = null; http://git-wip-us.apache.org/repos/asf/jena/blob/a226343a/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/StatementBase.java ---------------------------------------------------------------------- diff --git a/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/StatementBase.java b/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/StatementBase.java index 18b8ded..b4c1cf5 100644 --- a/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/StatementBase.java +++ b/jena-core/src/main/java/com/hp/hpl/jena/rdf/model/impl/StatementBase.java @@ -60,12 +60,9 @@ public abstract class StatementBase public abstract RDFNode getObject(); - protected StatementImpl stringReplace(String s, String lang, - boolean wellFormed) - { - return replace(new LiteralImpl(NodeFactory.createLiteral(s, lang, wellFormed), - model)); - } + protected StatementImpl stringReplace(String s, String lang, boolean wellFormed) { + return replace(new LiteralImpl(NodeFactory.createLiteral(s, lang, wellFormed), model)); + } /** * "replace" the Object of this statement with the literal string value _s_. http://git-wip-us.apache.org/repos/asf/jena/blob/a226343a/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/JenaReader.java ---------------------------------------------------------------------- diff --git a/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/JenaReader.java b/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/JenaReader.java index 0fc0e83..725bb8d 100644 --- a/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/JenaReader.java +++ b/jena-core/src/main/java/com/hp/hpl/jena/rdfxml/xmlinput/JenaReader.java @@ -106,7 +106,7 @@ public class JenaReader implements RDFReader, ARPErrorNumbers { private static Node convert(ALiteral lit) { String dtURI = lit.getDatatypeURI(); if (dtURI == null) - return NodeFactory.createLiteral(lit.toString(), lit.getLang(), false); + return NodeFactory.createLiteral(lit.toString(), lit.getLang()); if (lit.isWellFormedXML()) { return NodeFactory.createLiteral(lit.toString(), null, true); http://git-wip-us.apache.org/repos/asf/jena/blob/a226343a/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/Rule.java ---------------------------------------------------------------------- diff --git a/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/Rule.java b/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/Rule.java index 83e84c5..4f9814a 100755 --- a/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/Rule.java +++ b/jena-core/src/main/java/com/hp/hpl/jena/reasoner/rulesys/Rule.java @@ -896,7 +896,7 @@ public class Rule implements ClauseEntry { RDFDatatype dt = TypeMapper.getInstance().getSafeTypeByName(dtURI); return NodeFactory.createLiteral(lit, "", dt); } else { - return NodeFactory.createLiteral(lit, "", false); + return NodeFactory.createLiteral(lit, ""); } } else if ( Character.isDigit(token.charAt(0)) || (token.charAt(0) == '-' && token.length() > 1 && Character.isDigit(token.charAt(1))) ) { @@ -928,7 +928,7 @@ public class Rule implements ClauseEntry { } } // Default is a plain literal - return NodeFactory.createLiteral(lit, "", false); + return NodeFactory.createLiteral(lit, ""); } /** http://git-wip-us.apache.org/repos/asf/jena/blob/a226343a/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestNode.java ---------------------------------------------------------------------- diff --git a/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestNode.java b/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestNode.java index 3fda611..cf08efb 100644 --- a/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestNode.java +++ b/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestNode.java @@ -589,8 +589,8 @@ public class TestNode extends GraphTestBase { TypeMapper tm = TypeMapper.getInstance(); RDFDatatype dtInt = tm.getTypeByValue( new Integer( 10 ) ); - Node plain = NodeFactory.createLiteral( "rhubarb", "", false ); - Node english = NodeFactory.createLiteral( "eccentric", "en_UK", false ); + Node plain = NodeFactory.createLiteral( "rhubarb", ""); + Node english = NodeFactory.createLiteral( "eccentric", "en_UK"); Node typed = NodeFactory.createLiteral( "10", "", dtInt ); assertEquals( "\"rhubarb\"", plain.toString() ); assertEquals( "rhubarb", plain.toString( false ) ); http://git-wip-us.apache.org/repos/asf/jena/blob/a226343a/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestFBRules.java ---------------------------------------------------------------------- diff --git a/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestFBRules.java b/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestFBRules.java index efaba82..62c4db0 100644 --- a/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestFBRules.java +++ b/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestFBRules.java @@ -1032,7 +1032,7 @@ public class TestFBRules extends TestCase { getSkolem(a, Util.makeIntNode(43)) ); assertNotSame( getSkolem(a, NodeFactory.createLiteral("foo")), - getSkolem(a, NodeFactory.createLiteral("foo", "en", false)) ); + getSkolem(a, NodeFactory.createLiteral("foo", "en")) ); assertEquals( getSkolem(NodeFactory.createLiteral("foo")), getSkolem(NodeFactory.createLiteral("foo")));