You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by st...@apache.org on 2017/01/11 14:50:34 UTC
[3/3] commons-rdf git commit: Always lowercase other language tag on
comparison
Always lowercase other language tag on comparison
(it is not required to give it back case insensitive)
Project: http://git-wip-us.apache.org/repos/asf/commons-rdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-rdf/commit/b3a0fb80
Tree: http://git-wip-us.apache.org/repos/asf/commons-rdf/tree/b3a0fb80
Diff: http://git-wip-us.apache.org/repos/asf/commons-rdf/diff/b3a0fb80
Branch: refs/heads/COMMONSRDF-51-langtag-lcase
Commit: b3a0fb80506786a6b08b1335b3ee0962bffcd4f3
Parents: 5d2e88f
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Wed Jan 11 14:45:18 2017 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Wed Jan 11 14:45:18 2017 +0000
----------------------------------------------------------------------
.../main/java/org/apache/commons/rdf/simple/LiteralImpl.java | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-rdf/blob/b3a0fb80/simple/src/main/java/org/apache/commons/rdf/simple/LiteralImpl.java
----------------------------------------------------------------------
diff --git a/simple/src/main/java/org/apache/commons/rdf/simple/LiteralImpl.java b/simple/src/main/java/org/apache/commons/rdf/simple/LiteralImpl.java
index 3cca4c6..763a629 100644
--- a/simple/src/main/java/org/apache/commons/rdf/simple/LiteralImpl.java
+++ b/simple/src/main/java/org/apache/commons/rdf/simple/LiteralImpl.java
@@ -52,7 +52,7 @@ final class LiteralImpl implements Literal, SimpleRDF.SimpleRDFTerm {
public LiteralImpl(final String literal, final String languageTag) {
this.lexicalForm = Objects.requireNonNull(literal);
- this.languageTag = Objects.requireNonNull(languageTag).toLowerCase(Locale.ENGLISH);
+ this.languageTag = Objects.requireNonNull(lowerCase(languageTag));
if (languageTag.isEmpty()) {
// TODO: Check against
// http://www.w3.org/TR/n-triples/#n-triples-grammar
@@ -116,6 +116,10 @@ final class LiteralImpl implements Literal, SimpleRDF.SimpleRDFTerm {
return Objects.hash(lexicalForm, dataType, languageTag);
}
+ private static String lowerCase(String langTag) {
+ return langTag.toLowerCase(Locale.ROOT);
+ }
+
@Override
public boolean equals(final Object obj) {
if (this == obj) {
@@ -126,7 +130,7 @@ final class LiteralImpl implements Literal, SimpleRDF.SimpleRDFTerm {
}
final Literal literal = (Literal) obj;
return getDatatype().equals(literal.getDatatype()) && getLexicalForm().equals(literal.getLexicalForm())
- && getLanguageTag().equals(literal.getLanguageTag());
+ && getLanguageTag().equals(literal.getLanguageTag().map(LiteralImpl::lowerCase));
}
}