You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by cl...@apache.org on 2015/05/16 10:58:59 UTC
[17/50] [abbrv] jena git commit: Use StandardCharsets.UTF_8 where
possible.
Use StandardCharsets.UTF_8 where possible.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/dec69fa8
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/dec69fa8
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/dec69fa8
Branch: refs/heads/add-contract-tests
Commit: dec69fa8ad779fa5c42f583ef7b1a0c44683e800
Parents: a719f67
Author: Andy Seaborne <an...@apache.org>
Authored: Mon May 11 14:30:16 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Mon May 11 14:30:16 2015 +0100
----------------------------------------------------------------------
.../apache/jena/query/ResultSetFormatter.java | 8 +-
.../java/org/apache/jena/riot/web/HttpOp.java | 102 ++++++++-----------
.../apache/jena/riot/web/HttpResponseLib.java | 3 +-
.../jena/sparql/engine/http/HttpQuery.java | 2 -
.../org/apache/jena/sparql/expr/ExprDigest.java | 3 +-
.../jena/sparql/resultset/OutputBase.java | 18 +---
.../org/apache/jena/riot/TestRiotReader.java | 14 +--
7 files changed, 60 insertions(+), 90 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/dec69fa8/jena-arq/src/main/java/org/apache/jena/query/ResultSetFormatter.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/query/ResultSetFormatter.java b/jena-arq/src/main/java/org/apache/jena/query/ResultSetFormatter.java
index dd5ea8c..3852ef2 100644
--- a/jena-arq/src/main/java/org/apache/jena/query/ResultSetFormatter.java
+++ b/jena-arq/src/main/java/org/apache/jena/query/ResultSetFormatter.java
@@ -21,6 +21,7 @@ package org.apache.jena.query;
import java.io.ByteArrayOutputStream ;
import java.io.OutputStream ;
import java.io.UnsupportedEncodingException ;
+import java.nio.charset.StandardCharsets ;
import java.util.ArrayList ;
import java.util.Iterator ;
import java.util.List ;
@@ -189,12 +190,7 @@ public class ResultSetFormatter {
{
ByteArrayOutputStream arr = new ByteArrayOutputStream() ;
out(arr, qresults) ;
- try { return new String(arr.toByteArray(), "UTF-8") ; }
- catch (UnsupportedEncodingException e)
- {
- Log.warn(ResultSetFormatter.class, "UnsupportedEncodingException") ;
- return null ;
- }
+ return new String(arr.toByteArray(), StandardCharsets.UTF_8) ;
}
/** Return a string that has the result set serialized as a text table
http://git-wip-us.apache.org/repos/asf/jena/blob/dec69fa8/jena-arq/src/main/java/org/apache/jena/riot/web/HttpOp.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/web/HttpOp.java b/jena-arq/src/main/java/org/apache/jena/riot/web/HttpOp.java
index 21a11f9..af15916 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/web/HttpOp.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/web/HttpOp.java
@@ -18,52 +18,46 @@
package org.apache.jena.riot.web;
-import static java.lang.String.format;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.nio.charset.UnsupportedCharsetException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.atomic.AtomicLong;
-
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpMessage;
-import org.apache.http.HttpResponse;
-import org.apache.http.NameValuePair;
-import org.apache.http.StatusLine;
-import org.apache.http.client.HttpClient;
-import org.apache.http.client.entity.UrlEncodedFormEntity;
-import org.apache.http.client.methods.*;
-import org.apache.http.conn.ClientConnectionManager;
-import org.apache.http.entity.ContentType;
-import org.apache.http.entity.InputStreamEntity;
-import org.apache.http.entity.StringEntity;
-import org.apache.http.impl.client.AbstractHttpClient;
-import org.apache.http.impl.client.SystemDefaultHttpClient;
-import org.apache.http.impl.conn.PoolingClientConnectionManager;
-import org.apache.http.impl.conn.SchemeRegistryFactory;
-import org.apache.http.message.BasicNameValuePair;
-import org.apache.http.protocol.BasicHttpContext;
-import org.apache.http.protocol.HttpContext;
-import org.apache.http.util.EntityUtils;
-import org.apache.jena.atlas.io.IO;
-import org.apache.jena.atlas.lib.InternalErrorException;
-import org.apache.jena.atlas.web.HttpException;
-import org.apache.jena.atlas.web.TypedInputStream;
-import org.apache.jena.atlas.web.auth.HttpAuthenticator;
-import org.apache.jena.atlas.web.auth.ServiceAuthenticator;
+import static java.lang.String.format ;
+
+import java.io.IOException ;
+import java.io.InputStream ;
+import java.net.URI ;
+import java.net.URISyntaxException ;
+import java.nio.charset.StandardCharsets ;
+import java.util.ArrayList ;
+import java.util.List ;
+import java.util.concurrent.atomic.AtomicLong ;
+
+import org.apache.http.* ;
+import org.apache.http.client.HttpClient ;
+import org.apache.http.client.entity.UrlEncodedFormEntity ;
+import org.apache.http.client.methods.* ;
+import org.apache.http.conn.ClientConnectionManager ;
+import org.apache.http.entity.ContentType ;
+import org.apache.http.entity.InputStreamEntity ;
+import org.apache.http.entity.StringEntity ;
+import org.apache.http.impl.client.AbstractHttpClient ;
+import org.apache.http.impl.client.SystemDefaultHttpClient ;
+import org.apache.http.impl.conn.PoolingClientConnectionManager ;
+import org.apache.http.impl.conn.SchemeRegistryFactory ;
+import org.apache.http.message.BasicNameValuePair ;
+import org.apache.http.protocol.BasicHttpContext ;
+import org.apache.http.protocol.HttpContext ;
+import org.apache.http.util.EntityUtils ;
+import org.apache.jena.atlas.io.IO ;
+import org.apache.jena.atlas.web.HttpException ;
+import org.apache.jena.atlas.web.TypedInputStream ;
+import org.apache.jena.atlas.web.auth.HttpAuthenticator ;
+import org.apache.jena.atlas.web.auth.ServiceAuthenticator ;
import org.apache.jena.query.ARQ ;
-import org.apache.jena.riot.RiotException;
-import org.apache.jena.riot.WebContent;
+import org.apache.jena.riot.RiotException ;
+import org.apache.jena.riot.WebContent ;
import org.apache.jena.sparql.engine.http.Params ;
import org.apache.jena.sparql.engine.http.Params.Pair ;
-import org.apache.jena.web.HttpSC;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.jena.web.HttpSC ;
+import org.slf4j.Logger ;
+import org.slf4j.LoggerFactory ;
/**
* Simplified HTTP operations; simplification means only supporting certain uses
@@ -549,11 +543,9 @@ public class HttpOp {
HttpResponseHandler handler, HttpClient httpClient, HttpContext httpContext, HttpAuthenticator authenticator) {
StringEntity e = null;
try {
- e = new StringEntity(content, "UTF-8");
+ e = new StringEntity(content, StandardCharsets.UTF_8);
e.setContentType(contentType);
execHttpPost(url, e, acceptType, handler, httpClient, httpContext, authenticator);
- } catch (UnsupportedCharsetException | UnsupportedEncodingException e1) {
- throw new InternalErrorException("Platform does not support required UTF-8");
}
finally {
closeEntity(e);
@@ -898,11 +890,9 @@ public class HttpOp {
HttpContext httpContext, HttpAuthenticator authenticator) {
StringEntity e = null;
try {
- e = new StringEntity(content, "UTF-8");
+ e = new StringEntity(content, StandardCharsets.UTF_8);
e.setContentType(contentType);
execHttpPut(url, e, httpClient, httpContext, authenticator);
- } catch (UnsupportedCharsetException | UnsupportedEncodingException e1) {
- throw new InternalErrorException("Platform does not support required UTF-8");
}
finally {
closeEntity(e);
@@ -1238,15 +1228,11 @@ public class HttpOp {
}
private static HttpEntity convertFormParams(Params params) {
- try {
- List<NameValuePair> nvps = new ArrayList<>();
- for (Pair p : params.pairs())
- nvps.add(new BasicNameValuePair(p.getName(), p.getValue()));
- HttpEntity e = new UrlEncodedFormEntity(nvps, "UTF-8");
- return e;
- } catch (UnsupportedEncodingException e) {
- throw new InternalErrorException("Platform does not support required UTF-8");
- }
+ List<NameValuePair> nvps = new ArrayList<>();
+ for (Pair p : params.pairs())
+ nvps.add(new BasicNameValuePair(p.getName(), p.getValue()));
+ HttpEntity e = new UrlEncodedFormEntity(nvps, StandardCharsets.UTF_8);
+ return e;
}
private static void closeEntity(HttpEntity entity) {
http://git-wip-us.apache.org/repos/asf/jena/blob/dec69fa8/jena-arq/src/main/java/org/apache/jena/riot/web/HttpResponseLib.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/web/HttpResponseLib.java b/jena-arq/src/main/java/org/apache/jena/riot/web/HttpResponseLib.java
index 5ded84f..d6e87b9 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/web/HttpResponseLib.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/web/HttpResponseLib.java
@@ -20,6 +20,7 @@ package org.apache.jena.riot.web;
import java.io.IOException ;
import java.io.InputStream ;
+import java.nio.charset.StandardCharsets ;
import java.util.HashMap ;
import java.util.Map ;
@@ -83,7 +84,7 @@ public class HttpResponseLib
int l ;
byte buffer[] = new byte[1024] ;
while ((l = in.read(buffer)) != -1) {
- System.out.print(new String(buffer, 0, l, "UTF-8")) ;
+ System.out.print(new String(buffer, 0, l, StandardCharsets.UTF_8)) ;
}
}
} catch (IOException ex)
http://git-wip-us.apache.org/repos/asf/jena/blob/dec69fa8/jena-arq/src/main/java/org/apache/jena/sparql/engine/http/HttpQuery.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/http/HttpQuery.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/http/HttpQuery.java
index 0947b2a..153417d 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/http/HttpQuery.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/http/HttpQuery.java
@@ -78,8 +78,6 @@ public class HttpQuery extends Params {
private HttpClient client;
private boolean requireClientShutdown = true;
- // static final String ENC_UTF8 = "UTF-8" ;
-
/**
* Create a execution object for a whole model GET
*
http://git-wip-us.apache.org/repos/asf/jena/blob/dec69fa8/jena-arq/src/main/java/org/apache/jena/sparql/expr/ExprDigest.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/ExprDigest.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/ExprDigest.java
index f2df6d2..2455efd 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/ExprDigest.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/ExprDigest.java
@@ -18,6 +18,7 @@
package org.apache.jena.sparql.expr;
+import java.nio.charset.StandardCharsets ;
import java.security.MessageDigest ;
import java.security.NoSuchAlgorithmException ;
@@ -110,7 +111,7 @@ public abstract class ExprDigest extends ExprFunction1
try {
MessageDigest digest = getDigest() ;
String x = n.getLiteralLexicalForm() ;
- byte b[] = x.getBytes("UTF-8") ;
+ byte b[] = x.getBytes(StandardCharsets.UTF_8) ;
byte d[] = digest.digest(b) ;
String y = Bytes.asHexLC(d) ;
NodeValue result = NodeValue.makeString(y) ;
http://git-wip-us.apache.org/repos/asf/jena/blob/dec69fa8/jena-arq/src/main/java/org/apache/jena/sparql/resultset/OutputBase.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/resultset/OutputBase.java b/jena-arq/src/main/java/org/apache/jena/sparql/resultset/OutputBase.java
index 082ca6d..a47b529 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/resultset/OutputBase.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/resultset/OutputBase.java
@@ -19,12 +19,10 @@
package org.apache.jena.sparql.resultset;
import java.io.ByteArrayOutputStream ;
-import java.io.UnsupportedEncodingException ;
+import java.nio.charset.StandardCharsets ;
-import org.apache.jena.atlas.logging.Log ;
import org.apache.jena.query.ResultSet ;
-
public abstract class OutputBase implements OutputFormatter
{
@Override
@@ -32,23 +30,13 @@ public abstract class OutputBase implements OutputFormatter
{
ByteArrayOutputStream arr = new ByteArrayOutputStream() ;
format(arr, resultSet) ;
- try { return new String(arr.toByteArray(), "UTF-8") ; }
- catch (UnsupportedEncodingException e)
- {
- Log.warn(this, "UnsupportedEncodingException") ;
- return null ;
- }
+ return new String(arr.toByteArray(), StandardCharsets.UTF_8) ;
}
public String asString(boolean booleanResult)
{
ByteArrayOutputStream arr = new ByteArrayOutputStream() ;
format(arr, booleanResult) ;
- try { return new String(arr.toByteArray(), "UTF-8") ; }
- catch (UnsupportedEncodingException e)
- {
- Log.warn(this, "UnsupportedEncodingException") ;
- return null ;
- }
+ return new String(arr.toByteArray(), StandardCharsets.UTF_8) ;
}
}
http://git-wip-us.apache.org/repos/asf/jena/blob/dec69fa8/jena-arq/src/test/java/org/apache/jena/riot/TestRiotReader.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/riot/TestRiotReader.java b/jena-arq/src/test/java/org/apache/jena/riot/TestRiotReader.java
index 9b5ef5d..e516e65 100644
--- a/jena-arq/src/test/java/org/apache/jena/riot/TestRiotReader.java
+++ b/jena-arq/src/test/java/org/apache/jena/riot/TestRiotReader.java
@@ -24,7 +24,7 @@ import static org.junit.Assert.assertNotNull ;
import static org.junit.Assert.assertTrue ;
import java.io.ByteArrayInputStream ;
-import java.io.UnsupportedEncodingException ;
+import java.nio.charset.StandardCharsets ;
import java.util.Iterator ;
import org.apache.jena.atlas.lib.StrUtils ;
@@ -34,26 +34,26 @@ import org.junit.Test ;
public class TestRiotReader
{
@Test
- public void testCreateIteratorTriples_01() throws UnsupportedEncodingException
+ public void testCreateIteratorTriples_01()
{
- Iterator<Triple> it = RiotReader.createIteratorTriples(new ByteArrayInputStream("".getBytes("UTF-8")), RDFLanguages.NTRIPLES, "http://example/");
+ Iterator<Triple> it = RiotReader.createIteratorTriples(new ByteArrayInputStream("".getBytes(StandardCharsets.UTF_8)), RDFLanguages.NTRIPLES, "http://example/");
assertFalse(it.hasNext());
}
@Test
- public void testEncodedUTF8() throws UnsupportedEncodingException
+ public void testEncodedUTF8()
{
- Iterator<Triple> it = RiotReader.createIteratorTriples(new ByteArrayInputStream("<a> <b> \"\\u263A\" .".getBytes("UTF-8")), RDFLanguages.NTRIPLES, null);
+ Iterator<Triple> it = RiotReader.createIteratorTriples(new ByteArrayInputStream("<a> <b> \"\\u263A\" .".getBytes(StandardCharsets.UTF_8)), RDFLanguages.NTRIPLES, null);
assertTrue(it.hasNext());
assertEquals("☺", it.next().getObject().getLiteralLexicalForm());
}
@Test
- public void testRawUTF8() throws UnsupportedEncodingException
+ public void testRawUTF8()
{
- Iterator<Triple> it = RiotReader.createIteratorTriples(new ByteArrayInputStream("<a> <b> \"☺\" .".getBytes("UTF-8")), RDFLanguages.NTRIPLES, null);
+ Iterator<Triple> it = RiotReader.createIteratorTriples(new ByteArrayInputStream("<a> <b> \"☺\" .".getBytes(StandardCharsets.UTF_8)), RDFLanguages.NTRIPLES, null);
assertTrue(it.hasNext());
assertEquals("☺", it.next().getObject().getLiteralLexicalForm());