8000 GH-2126: Rename in NodeFactory: createLiteral(,lang) -> createLiteral… · AKSW/jena@4965c75 · GitHub
[go: up one dir, main page]
Skip to content

Commit 4965c75

Browse files
afsafs
committed
apacheGH-2126: Rename in NodeFactory: createLiteral(,lang) -> createLiteralLang(,lang)
1 parent 74a134d commit 4965c75

File tree

41 files changed

+270
-216
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+270
-216
lines changed

‎jena-arq/src/main/java/org/apache/jena/riot/RDFParserBuilder.java

+9-1
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,9 @@ public RDFParserBuilder canonicalValues(boolean flag) {
369369
* This option can slow parsing down.
370370
*
371371
* @see #langTagCanonical
372+
* @deprecated In Jena5, language tags are always converted to RFC 5646 case format.
372373
*/
374+
@Deprecated
373375
public RDFParserBuilder langTagLowerCase() {
374376
return langTagForm(LangTagForm.LOWER_CASE);
375377
}
@@ -388,7 +390,9 @@ public RDFParserBuilder langTagLowerCase() {
388390
* This option can slow parsing down.
389391
* </p>
390392
* @see #langTagLowerCase
393+
* @deprecated In Jena5, language tags are always converted to RFC 5646 case format.
391394
*/
395+
@Deprecated
392396
public RDFParserBuilder langTagCanonical() {
393397
return langTagForm(LangTagForm.CANONICAL);
394398
}
@@ -398,13 +402,17 @@ public RDFParserBuilder langTagCanonical() {
398402
* This is the default behaviour of parsing.
399403
* @see #langTagLowerCase
400404
* @see #langTagCanonical
405+
* @deprecated In Jena5, language tags are always converted to RFC 5646 case format.
401406
*/
407+
@Deprecated
402408
public RDFParserBuilder langTagAsGiven() {
403409
return langTagForm(LangTagForm.NONE);
404410
}
405411

406412
private RDFParserBuilder langTagForm(LangTagForm form) {
407-
this.langTagForm = form;
413+
// Ignore!
414+
// language tags are always converted to RFC 5646 case format.
415+
//this.langTagForm = form;
408416
return this;
409417
}
410418

‎jena-arq/src/main/java/org/apache/jena/riot/lang/rdfxml/ReaderRDFXML_ARP0.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ public void statement(AResource subj, AResource pred, ALiteral lit)
217217
private static Node convert(ALiteral lit) {
218218
String dtURI = lit.getDatatypeURI();
219219
if (dtURI == null)
220-
return NodeFactory.createLiteral(lit.toString(), lit.getLang());
220+
return NodeFactory.createLiteralLang(lit.toString(), lit.getLang());
221221

222222
if (lit.isWellFormedXML()) {
223223
return NodeFactory.createLiteral(lit.toString(), null, XMLLiteralType.theXMLLiteralType);

‎jena-arq/src/main/java/org/apache/jena/riot/process/normalize/CanonicalizeLiteral.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ private static Node canonicalLangtag(String lexicalForm, String langTag) {
110110
String langTag2 = LangTag.canonical(langTag);
111111
if ( langTag2.equals(langTag) )
112112
return null;
113-
return NodeFactory.createLiteral(lexicalForm, langTag2);
113+
return NodeFactory.createLiteralLang(lexicalForm, langTag2);
114114
}
115115

116116
private static final RDFDatatype dtPlainLiteral = NodeFactory.getType(RDF.getURI()+"PlainLiteral") ;

‎jena-arq/src/main/java/org/apache/jena/riot/process/normalize/NormalizeValue.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,6 @@ class NormalizeValue
202202
if ( idx == lexicalForm.length()-1 )
203203
return NodeFactory.createLiteral(lex) ;
204204
String lang = lexicalForm.substring(idx+1) ;
205-
return NodeFactory.createLiteral(lex, lang) ;
205+
return NodeFactory.createLiteralLang(lex, lang) ;
206206
} ;
207207
}

‎jena-arq/src/main/java/org/apache/jena/riot/process/normalize/StreamCanonicalLangTag.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import org.apache.jena.riot.system.StreamRDF;
2929
import org.apache.jena.sparql.util.NodeUtils;
3030

31-
/** {@link StreamRDF} that converts language tags to lower case o rto canokcal form (RFC 4646). */
31+
/** {@link StreamRDF} that converts language tags to lower case or to canonical form (RFC 4646, 5646). */
3232
public class StreamCanonicalLangTag extends StreamRDFApplyObject {
3333
/** Return a {@link StreamRDF} that converts language tags to lower case */
3434
public static StreamRDF toLC(StreamRDF other) {
@@ -58,11 +58,10 @@ private static Node canonical(Locale.Builder locBuild, Node n, BiFunction<Locale
5858
String langTag2 = tagMapper.apply(locBuild, langTag);
5959
if ( langTag == langTag2 )
6060
return n;
61-
Node obj2 = NodeFactory.createLiteral(n.getLiteralLexicalForm(), langTag2);
61+
Node obj2 = NodeFactory.createLiteralLang(n.getLiteralLexicalForm(), langTag2);
6262
return obj2;
6363
}
6464

65-
// From taken from "xsd4ld" (which has an Apache License).
6665
public static String langTagCan 10000 onical(Locale.Builder locBuild, String str) {
6766
try {
6867
// Does not do conversion of language for ISO 639 codes that have changed.

‎jena-arq/src/main/java/org/apache/jena/riot/protobuf/ProtobufConvert.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ public static Node convert(Cache<String, Node> uriCache, RDF_Term term, PrefixMa
176176
return NodeFactory.createLiteral(lex) ;
177177
case LANGTAG : {
178178
String lang = lit.getLangtag();
179-
return NodeFactory.createLiteral(lex, lang) ;
179+
return NodeFactory.createLiteralLang(lex, lang) ;
180180
}
181181
case DATATYPE : {
182182
String dtString = lit.getDatatype();

‎jena-arq/src/main/java/org/apache/jena/riot/system/FactoryRDFStd.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public Node createTypedLiteral(String lexical, RDFDatatype datatype) {
6262

6363
@Override
6464
public Node createLangLiteral(String lexical, String langTag) {
65-
return NodeFactory.createLiteral(lexical, langTag) ;
65+
return NodeFactory.createLiteralLang(lexical, langTag) ;
6666
}
6767

6868
@Override

‎jena-arq/src/main/java/org/apache/jena/riot/tokens/Token.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,7 @@ public Node asNode(PrefixMap pmap) {
402402
return NodeFactory.createLiteral(lexToken.getImage(), dt);
403403
}
404404
case LITERAL_LANG :
405-
return NodeFactory.createLiteral(tokenImage, tokenImage2);
405+
return NodeFactory.createLiteralLang(tokenImage, tokenImage2);
406406
case STRING :
407407
return NodeFactory.createLiteral(tokenImage);
408408
case VAR :

‎jena-arq/src/main/java/org/apache/jena/sparql/expr/NodeValue.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ public static NodeValue makeNode(String lexicalForm, String langTag, String data
277277

278278
Node n = null ;
279279
if ( langTag != null )
280-
n = NodeFactory.createLiteral(lexicalForm, langTag) ;
280+
n = NodeFactory.createLiteralLang(lexicalForm, langTag) ;
281281
else if ( datatype != null) {
282282
RDFDatatype dType = TypeMapper.getInstance().getSafeTypeByName(datatype) ;
283283
n = NodeFactory.createLiteral(lexicalForm, dType) ;

‎jena-arq/src/main/java/org/apache/jena/sparql/expr/nodevalue/NodeValueLang.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public boolean isLangString() {
6565

6666
@Override
6767
protected Node makeNode()
68-
{ return NodeFactory.createLiteral(string, lang) ; }
68+
{ return NodeFactory.createLiteralLang(string, lang) ; }
6969

7070
@Override
7171
public String toString() {

‎jena-arq/src/main/java/org/apache/jena/sparql/sse/lang/ParseHandlerPlain.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ public void emitLiteral(int line, int column, String lexicalForm, String langTag
143143
RDFDatatype dType = TypeMapper.getInstance().getSafeTypeByName(datatypeIRI);
144144
n = NodeFactory.createLiteral(lexicalForm, dType);
145145
} else
146-
n = NodeFactory.createLiteral(lexicalForm, langTag);
146+
n = NodeFactory.createLiteralLang(lexicalForm, langTag);
147147
node(n, line, column);
148148
}
149149

‎jena-arq/src/test/java/org/apache/jena/sparql/expr/TestFunctions.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ public void exprReplace14() {
244244
@Test public void exprNotOneOf_06() { test("57 not in (1,2,3)", TRUE) ; }
245245

246246

247-
static Node xyz_en = NodeFactory.createLiteral("xyz", "en") ;
247+
static Node xyz_en = NodeFactory.createLiteralLang("xyz", "en") ;
248248
static NodeValue nv_xyz_en = NodeValue.makeNode(xyz_en) ;
249249

250250
static Node xyz_xsd_string = NodeFactory.createLiteral("xyz", XSDDatatype.XSDstring) ;

‎jena-arq/src/test/java/org/apache/jena/sparql/expr/TestNodeFunctions.java

+7-7
Original file line numberDiff line numberDiff line change
@@ -62,14 +62,14 @@ public class TestNodeFunctions {
6262
}
6363

6464
@Test public void testSameTerm5() {
65-
Node n1 = NodeFactory.createLiteral("xyz", "en") ;
65+
Node n1 = NodeFactory.createLiteralLang("xyz", "en") ;
6666
Node n2 = NodeFactory.createLiteral("xyz") ;
6767
assertFalse(NodeFunctions.sameTerm(n1, n2)) ;
6868
}
6969

7070
@Test public void testSameTerm6() {
71-
Node n1 = NodeFactory.createLiteral("xyz", "en") ;
72-
Node n2 = NodeFactory.createLiteral("xyz", "EN") ;
71+
Node n1 = NodeFactory.createLiteralLang("xyz", "en") ;
72+
Node n2 = NodeFactory.createLiteralLang("xyz", "EN") ;
7373
assertTrue(NodeFunctions.sameTerm(n1, n2)) ;
7474
}
7575

@@ -80,16 +80,16 @@ public class TestNodeFunctions {
8080
}
8181

8282
@Test public void testRDFtermEquals2() {
83-
Node n1 = NodeFactory.createLiteral("xyz", "en") ;
84-
Node n2 = NodeFactory.createLiteral("xyz", "EN") ;
83+
Node n1 = NodeFactory.createLiteralLang("xyz", "en") ;
84+
Node n2 = NodeFactory.createLiteralLang("xyz", "EN") ;
8585
assertTrue(NodeFunctions.rdfTermEquals(n1, n2)) ;
8686
}
8787

8888
@Test(expected=ExprEvalException.class)
8989
public void testRDFtermEquals3() {
9090
// Unextended - not known to be same (no language tag support).
9191
Node n1 = NodeFactory.createLiteral("xyz") ;
92-
Node n2 = NodeFactory.createLiteral("xyz", "en") ;
92+
Node n2 = NodeFactory.createLiteralLang("xyz", "en") ;
9393
NodeFunctions.rdfTermEquals(n1, n2);
9494
}
9595

@@ -229,7 +229,7 @@ public void testDatatype6() {
229229
}
230230

231231
@Test public void testLang1() {
232-
Node n = NodeFactory.createLiteral("abc", "en-gb") ;
232+
Node n = NodeFactory.createLiteralLang("abc", "en-gb") ;
233233
assertEquals("en-gb", NodeFunctions.lang(n)) ;
234234
}
235235

‎jena-arq/src/test/java/org/apache/jena/sparql/expr/TestNodeValue.java

+8-8
Original file line numberDiff line numberDiff line change
@@ -742,14 +742,14 @@ public void testEBV6() {
742742
// EBV includes plain literals which includes language tagged literals.
743743
@Test
744744
public void testEBV7() {
745-
Node x = NodeFactory.createLiteral("", "en");
745+
Node x = NodeFactory.createLiteralLang("", "en");
746746
NodeValue v = NodeValue.makeNode(x);
747747
assertFalse("Not EBV false: " + v, XSDFuncOp.booleanEffectiveValue(v));
748748
}
749749

750750
@Test
751751
public void testEBV8() {
752-
Node x = NodeFactory.createLiteral("not empty", "en");
752+
Node x = NodeFactory.createLiteralLang("not empty", "en");
753753
NodeValue v = NodeValue.makeNode(x);
754754
assertTrue("Not EBV true: " + v, XSDFuncOp.booleanEffectiveValue(v));
755755
}
@@ -1109,28 +1109,28 @@ public void testSameValueNaN_float_2() {
11091109

11101110
@Test
11111111
public void testLang1() {
1112-
Node n1 = org.apache.jena.graph.NodeFactory.createLiteral("xyz", "en");
1112+
Node n1 = org.apache.jena.graph.NodeFactory.createLiteralLang("xyz", "en");
11131113
NodeValue nv1 = NodeValue.makeNode(n1);
1114-
Node n2 = org.apache.jena.graph.NodeFactory.createLiteral("xyz", "en");
1114+
Node n2 = org.apache.jena.graph.NodeFactory.createLiteralLang("xyz", "en");
11151115
NodeValue nv2 = NodeValue.makeNode(n2);
11161116
assertTrue(NodeValue.sameValueAs(nv1, nv2));
11171117
}
11181118

11191119
@Test
11201120
public void testLang2() {
1121-
Node n1 = org.apache.jena.graph.NodeFactory.createLiteral("xyz", "en");
1121+
Node n1 = org.apache.jena.graph.NodeFactory.createLiteralLang("xyz", "en");
11221122
NodeValue nv1 = NodeValue.makeNode(n1);
1123-
Node n2 = org.apache.jena.graph.NodeFactory.createLiteral("xyz", "EN");
1123+
Node n2 = org.apache.jena.graph.NodeFactory.createLiteralLang("xyz", "EN");
11241124
NodeValue nv2 = NodeValue.makeNode(n2);
11251125
assertTrue(NodeValue.sameValueAs(nv1, nv2));
11261126
assertFalse(nv1.equals(nv2));
11271127
}
11281128

11291129
@Test
11301130
public void testLang3() {
1131-
Node n1 = org.apache.jena.graph.NodeFactory.createLiteral("xyz", "en");
1131+
Node n1 = org.apache.jena.graph.NodeFactory.createLiteralLang("xyz", "en");
11321132
NodeValue nv1 = NodeValue.makeNode(n1);
1133-
Node n2 = org.apache.jena.graph.NodeFactory.createLiteral("xyz", "en");
1133+
Node n2 = org.apache.jena.graph.NodeFactory.createLiteralLang("xyz", "en");
11341134
NodeValue nv2 = NodeValue.makeNode(n2);
11351135
assertFalse(NodeValue.notSameValueAs(nv1, nv2));
11361136
}

‎jena-arq/src/test/java/org/apache/jena/sparql/expr/TestOrdering.java

+13-13
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ public void test_xsd_string5() {
163163

164164
@Test
165165
public void test_lang1() {
166-
NodeValue nv1 = NodeValue.makeNode(NodeFactory.createLiteral("abc", "en"));
166+
NodeValue nv1 = NodeValue.makeNode(NodeFactory.createLiteralLang("abc", "en"));
167167
NodeValue nv2 = NodeValue.makeNode(NodeFactory.createLiteral("abc"));
168168

169169
int x = NodeCmp.compareRDFTerms(nv1.asNode(), nv2.asNode());
@@ -172,17 +172,17 @@ public void test_lang1() {
172172

173173
@Test
174174
public void test_lang2() {
175-
NodeValue nv1 = NodeValue.makeNode(NodeFactory.createLiteral("abc", "en"));
176-
NodeValue nv2 = NodeValue.makeNode(NodeFactory.createLiteral("abc", "EN"));
175+
NodeValue nv1 = NodeValue.makeNode(NodeFactory.createLiteralLang("abc", "en"));
176+
NodeValue nv2 = NodeValue.makeNode(NodeFactory.createLiteralLang("abc", "EN"));
177177

178178
int x = NodeCmp.compareRDFTerms(nv1.asNode(), nv2.asNode());
179179
assertTrue("Lang tags should sort by case", Expr.CMP_GREATER == x);
180180
}
181181

182182
@Test
183183
public void test_lang3() {
184-
NodeValue nv1 = NodeValue.makeNode(NodeFactory.createLiteral("ABC", "en"));
185-
NodeValue nv2 = NodeValue.makeNode(NodeFactory.createLiteral("abc", "EN"));
184+
NodeValue nv1 = NodeValue.makeNode(NodeFactory.createLiteralLang("ABC", "en"));
185+
NodeValue nv2 = NodeValue.makeNode(NodeFactory.createLiteralLang("abc", "EN"));
186186

187187
int x = NodeValue.compareAlways(nv1, nv2);
188188
assertTrue("Lang nodes should sort by lexical if tags value-same", Expr.CMP_LESS == x);
@@ -192,8 +192,8 @@ public void test_lang3() {
192192

193193
@Test
194194
public void test_lang4() {
195-
NodeValue nv1 = NodeValue.makeNode(NodeFactory.createLiteral("ABC", "en"));
196-
NodeValue nv2 = NodeValue.makeNode(NodeFactory.createLiteral("abc", "en"));
195+
NodeValue nv1 = NodeValue.makeNode(NodeFactory.createLiteralLang("ABC", "en"));
196+
NodeValue nv2 = NodeValue.makeNode(NodeFactory.createLiteralLang("abc", "en"));
197197

198198
int x = NodeValue.compareAlways(nv1, nv2);
199199
assertTrue("Lang nodes should sort by lexical if tags the same", Expr.CMP_LESS == x);
@@ -204,7 +204,7 @@ public void test_lang4() {
204204
@Test
205205
public void test_lang5() {
206206
NodeValue nv1 = NodeValue.makeNode(NodeFactory.createLiteral("abc"));
207-
NodeValue nv2 = NodeValue.makeNode(NodeFactory.createLiteral("xyz", "en"));
207+
NodeValue nv2 = NodeValue.makeNode(NodeFactory.createLiteralLang("xyz", "en"));
208208

209209
int x = NodeValue.compareAlways(nv1, nv2);
210210
assertTrue("Lang nodes should sort by lexical form if one is plain", Expr.CMP_LESS == x);
@@ -215,7 +215,7 @@ public void test_lang5() {
215215
@Test
216216
public void test_lang6() {
217217
NodeValue nv1 = NodeValue.makeNode(NodeFactory.createLiteral("xyz"));
218-
NodeValue nv2 = NodeValue.makeNode(NodeFactory.createLiteral("abc", "en"));
218+
NodeValue nv2 = NodeValue.makeNode(NodeFactory.createLiteralLang("abc", "en"));
219219

220220
int x = NodeValue.compareAlways(nv1, nv2);
221221
assertTrue("Lang nodes should sort by language before lexical form", Expr.CMP_LESS == x);
@@ -225,8 +225,8 @@ public void test_lang6() {
225225

226226
@Test
227227
public void test_lang7() {
228-
NodeValue nv1 = NodeValue.makeNode(NodeFactory.createLiteral("xyz", "de"));
229-
NodeValue nv2 = NodeValue.makeNode(NodeFactory.createLiteral("abc", "en"));
228+
NodeValue nv1 = NodeValue.makeNode(NodeFactory.createLiteralLang("xyz", "de"));
229+
NodeValue nv2 = NodeValue.makeNode(NodeFactory.createLiteralLang("abc", "en"));
230230

231231
int x = NodeValue.compareAlways(nv1, nv2);
232232
assertTrue("Lang nodes should sort by language before lexical form", Expr.CMP_LESS == x);
@@ -237,7 +237,7 @@ public void test_lang7() {
237237
@Test
238238
public void test_lang8() {
239239
NodeValue nv1 = NodeValue.makeNode(NodeFactory.createLiteral("abc", XSDDatatype.XSDstring));
240-
NodeValue nv2 = NodeValue.makeNode(NodeFactory.createLiteral("xyz", "en"));
240+
NodeValue nv2 = NodeValue.makeNode(NodeFactory.createLiteralLang("xyz", "en"));
241241

242242
int x = NodeValue.compareAlways(nv1, nv2);
243243
assertTrue("Lang nodes should sort by lexical form if other is XSD string", Expr.CMP_LESS == x);
@@ -248,7 +248,7 @@ public void test_lang8() {
248248
@Test
249249
public void test_lang9() {
250250
NodeValue nv1 = NodeValue.makeNode(NodeFactory.createLiteral("xyz", XSDDatatype.XSDstring));
251-
NodeValue nv2 = NodeValue.makeNode(NodeFactory.createLiteral("abc", "en"));
251+
NodeValue nv2 = NodeValue.makeNode(NodeFactory.createLiteralLang("abc", "en"));
252252
// xsd:string (RDF 1.1) is a simple string and before @en.
253253
int x = NodeValue.compareAlways(nv1, nv2);
254254
assertTrue("Lang nodes should sort by lexical form if other is XSD string", Expr.CMP_LESS == x);

‎jena-arq/src/test/java/org/apache/jena/sparql/sse/TestSSE_Basic.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public class TestSSE_Basic
3434
static Node int1 = org.apache.jena.graph.NodeFactory.createLiteral("1", XSDDatatype.XSDinteger) ;
3535
static Node int2 = org.apache.jena.graph.NodeFactory.createLiteral("2", XSDDatatype.XSDinteger) ;
3636
static Node int3 = org.apache.jena.graph.NodeFactory.createLiteral("3", XSDDatatype.XSDinteger) ;
37-
static Node strLangEN = org.apache.jena.graph.NodeFactory.createLiteral("xyz", "en") ;
37+
static Node strLangEN = org.apache.jena.graph.NodeFactory.createLiteralLang("xyz", "en") ;
3838

3939
static Node typeLit1 = NodeFactoryExtra.createLiteralNode("123", null, "http://example/type") ;
4040

0 commit comments

Comments
 (0)
0