Repository: jena Updated Branches: refs/heads/master cee0769ff -> bc4518c2c
clean up UTF-8 charset usage. Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/3ea8534c Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/3ea8534c Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/3ea8534c Branch: refs/heads/master Commit: 3ea8534cea44a7063f59ab63c1566471fe2c2704 Parents: cee0769 Author: Andy Seaborne <[email protected]> Authored: Fri Feb 20 20:10:55 2015 +0000 Committer: Andy Seaborne <[email protected]> Committed: Fri Feb 20 20:10:55 2015 +0000 ---------------------------------------------------------------------- .../main/java/org/apache/jena/atlas/io/IO.java | 18 +++--------------- .../java/com/hp/hpl/jena/n3/JenaReaderBase.java | 5 +++-- .../main/java/com/hp/hpl/jena/util/FileUtils.java | 17 ++--------------- 3 files changed, 8 insertions(+), 32 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jena/blob/3ea8534c/jena-arq/src/main/java/org/apache/jena/atlas/io/IO.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/org/apache/jena/atlas/io/IO.java b/jena-arq/src/main/java/org/apache/jena/atlas/io/IO.java index 4d52fe2..8ddfca5 100644 --- a/jena-arq/src/main/java/org/apache/jena/atlas/io/IO.java +++ b/jena-arq/src/main/java/org/apache/jena/atlas/io/IO.java @@ -20,33 +20,21 @@ package org.apache.jena.atlas.io; import java.io.* ; import java.nio.charset.Charset ; +import java.nio.charset.StandardCharsets ; import java.util.zip.GZIPInputStream ; import java.util.zip.GZIPOutputStream ; import org.apache.jena.atlas.RuntimeIOException ; -import org.apache.jena.atlas.logging.Log ; import org.apache.jena.riot.out.CharSpace ; import org.apache.jena.riot.system.IRILib ; -import com.hp.hpl.jena.util.FileUtils ; - public class IO { public static final int EOF = -1 ; public static final int UNSET = -2 ; - /** Java name for UTF-8 encoding */ - public static final String encodingUTF8 = "utf-8" ; - public static final String encodingAscii = "ascii" ; - - private static Charset utf8 = null ; - private static Charset ascii = null ; - static { - try { - utf8 = Charset.forName(encodingUTF8) ; - ascii = Charset.forName(encodingAscii) ; - } catch (Throwable ex) { Log.fatal(FileUtils.class, "Failed to get charset", ex) ; } - } + private static Charset utf8 = StandardCharsets.UTF_8 ; + private static Charset ascii = StandardCharsets.US_ASCII ; /** Open an input stream to a file. * If the filename is null or "-", return System.in http://git-wip-us.apache.org/repos/asf/jena/blob/3ea8534c/jena-core/src/main/java/com/hp/hpl/jena/n3/JenaReaderBase.java ---------------------------------------------------------------------- diff --git a/jena-core/src/main/java/com/hp/hpl/jena/n3/JenaReaderBase.java b/jena-core/src/main/java/com/hp/hpl/jena/n3/JenaReaderBase.java index 89bf62b..f9b8eb6 100644 --- a/jena-core/src/main/java/com/hp/hpl/jena/n3/JenaReaderBase.java +++ b/jena-core/src/main/java/com/hp/hpl/jena/n3/JenaReaderBase.java @@ -22,6 +22,7 @@ import com.hp.hpl.jena.graph.GraphEvents; import com.hp.hpl.jena.rdf.model.*; import java.net.* ; +import java.nio.charset.StandardCharsets ; import java.io.* ; import org.slf4j.LoggerFactory; @@ -55,7 +56,7 @@ public abstract class JenaReaderBase implements RDFReader URLConnection conn = new URL(url).openConnection(); String encoding = conn.getContentEncoding(); if ( encoding == null ) - read(model, new InputStreamReader(conn.getInputStream(), FileUtils.encodingUTF8), url); + read(model, new InputStreamReader(conn.getInputStream(), StandardCharsets.UTF_8), url); else { LoggerFactory.getLogger(this.getClass()).warn("URL content is not UTF-8") ; @@ -101,7 +102,7 @@ public abstract class JenaReaderBase implements RDFReader if ( r instanceof FileReader ) { FileReader f = (FileReader)r ; - if ( f.getEncoding().equalsIgnoreCase(FileUtils.encodingUTF8) ) + if ( f.getEncoding().equalsIgnoreCase(StandardCharsets.UTF_8.name()) ) LoggerFactory.getLogger(this.getClass()).warn("FileReader is not UTF-8") ; } } http://git-wip-us.apache.org/repos/asf/jena/blob/3ea8534c/jena-core/src/main/java/com/hp/hpl/jena/util/FileUtils.java ---------------------------------------------------------------------- diff --git a/jena-core/src/main/java/com/hp/hpl/jena/util/FileUtils.java b/jena-core/src/main/java/com/hp/hpl/jena/util/FileUtils.java index 5658d3f..c9d9303 100644 --- a/jena-core/src/main/java/com/hp/hpl/jena/util/FileUtils.java +++ b/jena-core/src/main/java/com/hp/hpl/jena/util/FileUtils.java @@ -21,8 +21,7 @@ package com.hp.hpl.jena.util; import java.io.* ; import java.net.URL ; import java.nio.charset.Charset ; - -import org.slf4j.LoggerFactory ; +import java.nio.charset.StandardCharsets ; import com.hp.hpl.jena.JenaRuntime ; import com.hp.hpl.jena.shared.JenaException ; @@ -36,19 +35,7 @@ public class FileUtils public static final String langN3 = "N3" ; public static final String langTurtle = "TURTLE" ; - /** Java name for UTF-8 encoding */ - public static final String encodingUTF8 = "utf-8" ; - - static Charset utf8 = null ; - static { - try { - utf8 = Charset.forName(encodingUTF8) ; - } catch (Throwable ex) - { - LoggerFactory.getLogger(FileUtils.class).warn("Failed to get charset for UTF-8", ex) ; - } - } - + static Charset utf8 = StandardCharsets.UTF_8 ; /** Create a reader that uses UTF-8 encoding */
