From commits-return-19156-archive-asf-public=cust-asf.ponee.io@jena.apache.org Mon Jan 15 12:48:10 2018 Return-Path: X-Original-To: archive-asf-public@eu.ponee.io Delivered-To: archive-asf-public@eu.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by mx-eu-01.ponee.io (Postfix) with ESMTP id 6F1E3180657 for ; Mon, 15 Jan 2018 12:48:10 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 5FFA6160C31; Mon, 15 Jan 2018 11:48:10 +0000 (UTC) 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 816C4160C47 for ; Mon, 15 Jan 2018 12:48:09 +0100 (CET) Received: (qmail 86935 invoked by uid 500); 15 Jan 2018 11:48:08 -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 86848 invoked by uid 99); 15 Jan 2018 11:48:08 -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; Mon, 15 Jan 2018 11:48:08 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C9751E78E6; Mon, 15 Jan 2018 11:48:06 +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 Date: Mon, 15 Jan 2018 11:48:12 -0000 Message-Id: <8715d3897ff24a0e9a990823a2cf2b2a@git.apache.org> In-Reply-To: <1a46f77717054f60a83cf69d378b9158@git.apache.org> References: <1a46f77717054f60a83cf69d378b9158@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [07/10] jena git commit: JENA-1463: Fix for file://host/path JENA-1463: Fix for file://host/path Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/1d037e80 Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/1d037e80 Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/1d037e80 Branch: refs/heads/master Commit: 1d037e80dfd8a91e9c4042f65695cadec4b17097 Parents: aecfaac Author: Andy Seaborne Authored: Sat Jan 13 17:24:29 2018 +0000 Committer: Andy Seaborne Committed: Sat Jan 13 17:24:29 2018 +0000 ---------------------------------------------------------------------- jena-base/src/main/java/org/apache/jena/atlas/lib/IRILib.java | 6 +++--- .../org/apache/jena/atlas/lib/TestFilenameProcessing.java | 7 +++++-- 2 files changed, 8 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jena/blob/1d037e80/jena-base/src/main/java/org/apache/jena/atlas/lib/IRILib.java ---------------------------------------------------------------------- diff --git a/jena-base/src/main/java/org/apache/jena/atlas/lib/IRILib.java b/jena-base/src/main/java/org/apache/jena/atlas/lib/IRILib.java index 18f3b94..ffe05de 100644 --- a/jena-base/src/main/java/org/apache/jena/atlas/lib/IRILib.java +++ b/jena-base/src/main/java/org/apache/jena/atlas/lib/IRILib.java @@ -192,14 +192,14 @@ public class IRILib return plainFilenameToURL(fn2) ; } - // Starts file:/// + // Starts file:// or file:/// if ( fn.startsWith("file:///") ) // Assume it's good and return as-is. return fn ; if ( fn.startsWith("file://") ) { - String fn2 = fn.substring("file:/".length()) ; // Leave one "/" - return plainFilenameToURL(fn2) ; + // file: URL with host name (maybe!) + return fn ; } // Must be file:/ http://git-wip-us.apache.org/repos/asf/jena/blob/1d037e80/jena-base/src/test/java/org/apache/jena/atlas/lib/TestFilenameProcessing.java ---------------------------------------------------------------------- diff --git a/jena-base/src/test/java/org/apache/jena/atlas/lib/TestFilenameProcessing.java b/jena-base/src/test/java/org/apache/jena/atlas/lib/TestFilenameProcessing.java index e34fe3e..84d08c4 100644 --- a/jena-base/src/test/java/org/apache/jena/atlas/lib/TestFilenameProcessing.java +++ b/jena-base/src/test/java/org/apache/jena/atlas/lib/TestFilenameProcessing.java @@ -65,8 +65,11 @@ public class TestFilenameProcessing extends BaseTest @Test public void fileIRI_3() { - String uri = testFileIRI("file://D.ttl") ; - assertTrue(uri.endsWith("D.ttl")) ; + String fn = "file://some.host/D.ttl" ; + String uri1 = IRILib.filenameToIRI(fn) ; + assertEquals(fn, uri1); + String uri2 = IRILib.filenameToIRI(uri1) ; + assertEquals(uri1, uri2) ; } @Test