Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id B9FB7200AEE for ; Wed, 4 May 2016 00:27:17 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id B87DB1609F6; Wed, 4 May 2016 00:27:17 +0200 (CEST) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 0DE2E1609F5 for ; Wed, 4 May 2016 00:27:16 +0200 (CEST) Received: (qmail 18341 invoked by uid 500); 3 May 2016 22:27:16 -0000 Mailing-List: contact commits-help@commonsrdf.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@commonsrdf.incubator.apache.org Delivered-To: mailing list commits@commonsrdf.incubator.apache.org Received: (qmail 18332 invoked by uid 99); 3 May 2016 22:27:16 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 May 2016 22:27:16 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id A51AACA182 for ; Tue, 3 May 2016 22:27:15 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -4.216 X-Spam-Level: X-Spam-Status: No, score=-4.216 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.996] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id O0LvzwjsYeu1 for ; Tue, 3 May 2016 22:27:13 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with SMTP id 6FF845F1B3 for ; Tue, 3 May 2016 22:27:12 +0000 (UTC) Received: (qmail 18274 invoked by uid 99); 3 May 2016 22:27:11 -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 May 2016 22:27:11 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 5B7EBDFC7E; Tue, 3 May 2016 22:27:11 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: stain@apache.org To: commits@commonsrdf.incubator.apache.org Message-Id: <46eedbb93c774eddaff60b3f1d853750@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: incubator-commonsrdf git commit: Escape BlankNode labels - if needed Date: Tue, 3 May 2016 22:27:11 +0000 (UTC) archived-at: Tue, 03 May 2016 22:27:17 -0000 Repository: incubator-commonsrdf Updated Branches: refs/heads/rdf4j b58505747 -> c3ee194a4 Escape BlankNode labels - if needed Project: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/commit/c3ee194a Tree: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/tree/c3ee194a Diff: http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/diff/c3ee194a Branch: refs/heads/rdf4j Commit: c3ee194a4f380660d2c878226ae5f51527e7f69c Parents: b585057 Author: Stian Soiland-Reyes Authored: Tue May 3 23:27:05 2016 +0100 Committer: Stian Soiland-Reyes Committed: Tue May 3 23:27:05 2016 +0100 ---------------------------------------------------------------------- .../commons/rdf/rdf4j/Rdf4JRDFTermFactory.java | 24 ++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-commonsrdf/blob/c3ee194a/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/Rdf4JRDFTermFactory.java ---------------------------------------------------------------------- diff --git a/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/Rdf4JRDFTermFactory.java b/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/Rdf4JRDFTermFactory.java index 9c0007c..9619299 100644 --- a/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/Rdf4JRDFTermFactory.java +++ b/rdf4j/src/main/java/org/apache/commons/rdf/rdf4j/Rdf4JRDFTermFactory.java @@ -17,6 +17,7 @@ */ package org.apache.commons.rdf.rdf4j; +import java.nio.charset.StandardCharsets; import java.util.Objects; import java.util.Optional; import java.util.UUID; @@ -298,8 +299,27 @@ public class Rdf4JRDFTermFactory implements RDFTermFactory { @Override public String ntriplesString() { - // FIXME: Don't expose value.getID() if it's not valid ntriplesString(); - return "_:" + value.getID(); + if (isValidBlankNodeLabel(value.getID())) { + return "_:" + value.getID(); + } else { + return "_:" + UUID.nameUUIDFromBytes(value.getID().getBytes(StandardCharsets.UTF_8)); + } + } + + private boolean isValidBlankNodeLabel(String id) { + // FIXME: Replace with a regular expression? + if (id.isEmpty()) { + return false; + } + if (! TurtleUtil.isBLANK_NODE_LABEL_StartChar(id.codePointAt(0))) { + return false; + } + for (int i=1; i