Return-Path: X-Original-To: apmail-jena-commits-archive@www.apache.org Delivered-To: apmail-jena-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C8730187C5 for ; Tue, 3 Nov 2015 11:24:04 +0000 (UTC) Received: (qmail 59895 invoked by uid 500); 3 Nov 2015 11:24:04 -0000 Delivered-To: apmail-jena-commits-archive@jena.apache.org Received: (qmail 59870 invoked by uid 500); 3 Nov 2015 11:24:04 -0000 Mailing-List: contact commits-help@jena.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jena.apache.org Delivered-To: mailing list commits@jena.apache.org Received: (qmail 59861 invoked by uid 99); 3 Nov 2015 11:24:04 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 Nov 2015 11:24:04 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 6A1B4E00C5; Tue, 3 Nov 2015 11:24:04 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: andy@apache.org To: commits@jena.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: jena git commit: Fix: Spec says ENCODE_FOR_URI should work with lang tag strings. Date: Tue, 3 Nov 2015 11:24:04 +0000 (UTC) Repository: jena Updated Branches: refs/heads/master b0d1a9dc9 -> be12606ca Fix: Spec says ENCODE_FOR_URI should work with lang tag strings. Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/be12606c Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/be12606c Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/be12606c Branch: refs/heads/master Commit: be12606cab9b7107d877635a75dc0069f7689e30 Parents: b0d1a9d Author: Andy Seaborne Authored: Mon Nov 2 22:00:31 2015 +0000 Committer: Andy Seaborne Committed: Tue Nov 3 11:23:16 2015 +0000 ---------------------------------------------------------------------- .../java/org/apache/jena/sparql/expr/nodevalue/XSDFuncOp.java | 7 +++---- .../test/java/org/apache/jena/sparql/expr/TestFunctions2.java | 4 +++- 2 files changed, 6 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jena/blob/be12606c/jena-arq/src/main/java/org/apache/jena/sparql/expr/nodevalue/XSDFuncOp.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/nodevalue/XSDFuncOp.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/nodevalue/XSDFuncOp.java index 57a2497..6b2ea50 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/nodevalue/XSDFuncOp.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/nodevalue/XSDFuncOp.java @@ -52,6 +52,7 @@ import org.apache.jena.datatypes.xsd.XSDDatatype ; import org.apache.jena.datatypes.xsd.XSDDateTime ; import org.apache.jena.graph.Node ; import org.apache.jena.graph.NodeFactory ; +import org.apache.jena.rdf.model.impl.Util ; import org.apache.jena.sparql.ARQInternalErrorException ; import org.apache.jena.sparql.SystemARQ ; import org.apache.jena.sparql.expr.* ; @@ -583,10 +584,8 @@ public class XSDFuncOp Node n = v.asNode() ; if ( !n.isLiteral() ) throw new ExprEvalException("Not a literal") ; - if ( n.getLiteralDatatype() != null ) { - if ( !n.getLiteralDatatype().equals(XSDDatatype.XSDstring) ) - throw new ExprEvalException("Not a string literal") ; - } + if ( ! Util.isSimpleString(n) && ! Util.isLangString(n) ) + throw new ExprEvalException("Not a string literal") ; String str = n.getLiteralLexicalForm() ; String encStr = IRILib.encodeUriComponent(str) ; http://git-wip-us.apache.org/repos/asf/jena/blob/be12606c/jena-arq/src/test/java/org/apache/jena/sparql/expr/TestFunctions2.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/expr/TestFunctions2.java b/jena-arq/src/test/java/org/apache/jena/sparql/expr/TestFunctions2.java index 7b8c04d..10e1747 100644 --- a/jena-arq/src/test/java/org/apache/jena/sparql/expr/TestFunctions2.java +++ b/jena-arq/src/test/java/org/apache/jena/sparql/expr/TestFunctions2.java @@ -188,9 +188,11 @@ public class TestFunctions2 extends BaseTest @Test public void encodeURI_01() { test("encode_for_uri('a:b cd/~')", "'a%3Ab%20cd%2F~'") ; } @Test public void encodeURI_02() { test("encode_for_uri('\\n')", "'%0A'") ; } @Test public void encodeURI_03() { test("encode_for_uri('\\t')", "'%09'") ; } + @Test public void encodeURI_04() { test("encode_for_uri('abc')", "'abc'") ; } + @Test public void encodeURI_05() { test("encode_for_uri('abc'@en)", "'abc'") ; } @Test(expected=ExprEvalException.class) - public void encodeURI_04() { test("encode_for_uri(1234)", "'1234'") ; } + public void encodeURI_09() { test("encode_for_uri(1234)", "'1234'") ; } /* Compatibility rules # pairs of simple literals,