You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commonsrdf.apache.org by an...@apache.org on 2015/03/28 06:37:34 UTC

[2/3] incubator-commonsrdf git commit: Ensure that people do not assume rdf:langString is usable without a language tag

Ensure that people do not assume rdf:langString is usable without a
language tag

Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/601b8bca
Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/601b8bca
Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/601b8bca

Branch: refs/heads/master
Commit: 601b8bcac1c920a427fdcbf2537ba147a6ffd3ec
Parents: 98b5d3b
Author: Peter Ansell <p_...@yahoo.com>
Authored: Sat Mar 28 16:36:03 2015 +1100
Committer: Peter Ansell <p_...@yahoo.com>
Committed: Sat Mar 28 16:36:03 2015 +1100

----------------------------------------------------------------------
 api/src/main/java/org/apache/commons/rdf/api/Literal.java   | 9 ++++++++-
 .../java/org/apache/commons/rdf/simple/LiteralImpl.java     | 5 +++++
 2 files changed, 13 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/601b8bca/api/src/main/java/org/apache/commons/rdf/api/Literal.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/commons/rdf/api/Literal.java b/api/src/main/java/org/apache/commons/rdf/api/Literal.java
index 3890404..6f348f0 100644
--- a/api/src/main/java/org/apache/commons/rdf/api/Literal.java
+++ b/api/src/main/java/org/apache/commons/rdf/api/Literal.java
@@ -42,7 +42,14 @@ public interface Literal extends RDFTerm {
 	/**
 	 * The IRI identifying the datatype that determines how the lexical form
 	 * maps to a literal value.
-	 *
+	 * <p>
+	 * If the datatype IRI is <a
+	 * href="http://www.w3.org/1999/02/22-rdf-syntax-ns#langString"
+	 * >http://www.w3.org/1999/02/22-rdf-syntax-ns#langString</a>,
+	 * {@link #getLanguageTag()} must not return {@link Optional#empty()}, and
+	 * it must return a valid <a
+	 * href="http://tools.ietf.org/html/bcp47">BCP47</a> language tag.
+	 * 
 	 * @return The datatype IRI for this literal.
 	 * @see <a
 	 *      href="http://www.w3.org/TR/rdf11-concepts/#dfn-datatype-iri">RDF-1.1

http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/601b8bca/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 13c65ef..99f3b0d 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
@@ -45,6 +45,11 @@ final class LiteralImpl implements Literal {
 		this.lexicalForm = Objects.requireNonNull(lexicalForm);
 		this.dataType = Types.get(Objects.requireNonNull(dataType)).orElse(
 				dataType);
+		if (Types.RDF_LANGSTRING.equals(this.dataType)) {
+			throw new IllegalArgumentException(
+					"Cannot create a non-language literal with type "
+							+ Types.RDF_LANGSTRING);
+		}
 		this.languageTag = null;
 	}