From c91e712178c7b8f3ef8514cde8be70dd47d7e0e1 Mon Sep 17 00:00:00 2001 From: reger Date: Thu, 7 Jan 2016 16:17:37 +0100 Subject: [PATCH] further refactor using standard java / (one) utf-8 charset variable extending initiative of commit https://github.com/yacy/yacy_search_server/commit/9a2575185027fe822956a4edf538c304862ed0d5 --- .../net/yacy/cora/document/encoding/UTF8.java | 17 ++++++----------- .../opensearch/OpenSearchConnector.java | 3 +-- .../net/yacy/cora/lod/vocabulary/Tagging.java | 3 ++- .../yacy/http/servlets/GSAsearchServlet.java | 4 ++-- .../yacy/http/servlets/SolrSelectServlet.java | 3 ++- .../net/yacy/http/servlets/UrlProxyServlet.java | 4 ++-- .../yacy/http/servlets/YaCyProxyServlet.java | 6 +++--- 7 files changed, 18 insertions(+), 22 deletions(-) diff --git a/source/net/yacy/cora/document/encoding/UTF8.java b/source/net/yacy/cora/document/encoding/UTF8.java index e7ad4b706..dcb9d5ddf 100644 --- a/source/net/yacy/cora/document/encoding/UTF8.java +++ b/source/net/yacy/cora/document/encoding/UTF8.java @@ -24,7 +24,6 @@ package net.yacy.cora.document.encoding; -import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; import java.util.Comparator; @@ -42,11 +41,7 @@ import org.apache.http.entity.mime.content.StringBody; */ public class UTF8 implements Comparator { - public final static Charset charset; - static { - charset = StandardCharsets.UTF_8; - } - private final static ContentType contentType = ContentType.TEXT_PLAIN.withCharset(charset); + private final static ContentType contentType = ContentType.TEXT_PLAIN.withCharset(StandardCharsets.UTF_8); public static final UTF8 insensitiveUTF8Comparator = new UTF8(true); public static final UTF8 identityUTF8Comparator = new UTF8(false); @@ -115,11 +110,11 @@ public class UTF8 implements Comparator { * @return */ public final static String String(final byte[] bytes) { - return new String(bytes, 0, bytes.length, charset); + return new String(bytes, 0, bytes.length, StandardCharsets.UTF_8); } public final static String String(final byte[] bytes, final int offset, final int length) { - return new String(bytes, offset, length, charset); + return new String(bytes, offset, length, StandardCharsets.UTF_8); } /** @@ -201,12 +196,12 @@ public class UTF8 implements Comparator { */ public final static byte[] getBytes(final String s) { if (s == null) return null; - return s.getBytes(charset); + return s.getBytes(StandardCharsets.UTF_8); } public final static byte[] getBytes(final StringBuilder s) { if (s == null) return null; - return s.toString().getBytes(charset); + return s.toString().getBytes(StandardCharsets.UTF_8); } /** @@ -257,7 +252,7 @@ public class UTF8 implements Comparator { return s; //throw new IllegalArgumentException("URLDecoder: Incomplete trailing escape (%) pattern"); } - sb.append(new String(bytes, 0, pos, charset)); + sb.append(new String(bytes, 0, pos, StandardCharsets.UTF_8)); } catch (final NumberFormatException e) { return s; //throw new IllegalArgumentException("URLDecoder: Illegal hex characters in escape (%) pattern - " + e.getMessage()); diff --git a/source/net/yacy/cora/federate/opensearch/OpenSearchConnector.java b/source/net/yacy/cora/federate/opensearch/OpenSearchConnector.java index ccc499d82..d5131d821 100644 --- a/source/net/yacy/cora/federate/opensearch/OpenSearchConnector.java +++ b/source/net/yacy/cora/federate/opensearch/OpenSearchConnector.java @@ -25,7 +25,6 @@ import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import net.yacy.cora.document.encoding.UTF8; import net.yacy.cora.document.feed.RSSFeed; import net.yacy.cora.document.feed.RSSMessage; import net.yacy.cora.document.feed.RSSReader; @@ -98,7 +97,7 @@ public class OpenSearchConnector extends AbstractFederateSearchConnector impleme DigestURL uri = new DigestURL(item.getLink()); URIMetadataNode doc = new URIMetadataNode(uri); - doc.setField(CollectionSchema.charset_s.getSolrFieldName(), UTF8.charset.name()); + doc.setField(CollectionSchema.charset_s.getSolrFieldName(), StandardCharsets.UTF_8.name()); doc.setField(CollectionSchema.author.getSolrFieldName(), item.getAuthor()); doc.setField(CollectionSchema.title.getSolrFieldName(), item.getTitle()); doc.setField(CollectionSchema.language_s.getSolrFieldName(), item.getLanguage()); diff --git a/source/net/yacy/cora/lod/vocabulary/Tagging.java b/source/net/yacy/cora/lod/vocabulary/Tagging.java index 31fbc9461..5281c900b 100644 --- a/source/net/yacy/cora/lod/vocabulary/Tagging.java +++ b/source/net/yacy/cora/lod/vocabulary/Tagging.java @@ -26,6 +26,7 @@ import java.io.FileOutputStream; import java.io.FileWriter; import java.io.IOException; import java.io.OutputStreamWriter; +import java.nio.charset.StandardCharsets; import java.util.HashSet; import java.util.LinkedHashMap; import java.util.Map; @@ -159,7 +160,7 @@ public class Tagging { } } else { // - BufferedWriter w = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(propFile), UTF8.charset.name())); + BufferedWriter w = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(propFile), StandardCharsets.UTF_8.name())); if (objectspace != null && objectspace.length() > 0) w.write("#objectspace:" + objectspace + "\n"); for (Map.Entry e: table.entrySet()) { String s = e.getValue() == null ? "" : e.getValue().getSynonymsCSV(); diff --git a/source/net/yacy/http/servlets/GSAsearchServlet.java b/source/net/yacy/http/servlets/GSAsearchServlet.java index c531e7603..89468c030 100644 --- a/source/net/yacy/http/servlets/GSAsearchServlet.java +++ b/source/net/yacy/http/servlets/GSAsearchServlet.java @@ -23,6 +23,7 @@ import java.io.IOException; import java.io.OutputStream; import java.io.OutputStreamWriter; import java.io.Writer; +import java.nio.charset.StandardCharsets; import java.util.Date; import java.util.Iterator; import java.util.List; @@ -34,7 +35,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import net.yacy.cora.date.ISO8601Formatter; -import net.yacy.cora.document.encoding.UTF8; import net.yacy.cora.federate.solr.Ranking; import net.yacy.cora.federate.solr.connector.EmbeddedSolrConnector; import net.yacy.cora.federate.solr.responsewriter.GSAResponseWriter; @@ -236,7 +236,7 @@ public class GSAsearchServlet extends HttpServlet { */ // write the result directly to the output stream - Writer ow = new FastWriter(new OutputStreamWriter(out, UTF8.charset)); + Writer ow = new FastWriter(new OutputStreamWriter(out, StandardCharsets.UTF_8)); try { responseWriter.write(ow, req, response); ow.flush(); diff --git a/source/net/yacy/http/servlets/SolrSelectServlet.java b/source/net/yacy/http/servlets/SolrSelectServlet.java index bba3de81f..c04306877 100644 --- a/source/net/yacy/http/servlets/SolrSelectServlet.java +++ b/source/net/yacy/http/servlets/SolrSelectServlet.java @@ -27,6 +27,7 @@ import java.io.PrintWriter; import java.io.StringWriter; import java.io.Writer; import java.net.URL; +import java.nio.charset.StandardCharsets; import java.util.Date; import java.util.HashMap; import java.util.Map; @@ -252,7 +253,7 @@ public class SolrSelectServlet extends HttpServlet { if (responseWriter instanceof BinaryResponseWriter) { ((BinaryResponseWriter) responseWriter).write(response.getOutputStream(), req, rsp); } else { - out = new FastWriter(new OutputStreamWriter(response.getOutputStream(), UTF8.charset)); + out = new FastWriter(new OutputStreamWriter(response.getOutputStream(), StandardCharsets.UTF_8)); responseWriter.write(out, req, rsp); out.flush(); } diff --git a/source/net/yacy/http/servlets/UrlProxyServlet.java b/source/net/yacy/http/servlets/UrlProxyServlet.java index 66c84c2b1..f4c54a08a 100644 --- a/source/net/yacy/http/servlets/UrlProxyServlet.java +++ b/source/net/yacy/http/servlets/UrlProxyServlet.java @@ -132,7 +132,7 @@ public class UrlProxyServlet extends ProxyServlet implements Servlet { try { proxyurl = new URL(strUrl); } catch (final MalformedURLException e) { - proxyurl = new URL(URLDecoder.decode(strUrl, UTF8.charset.name())); + proxyurl = new URL(URLDecoder.decode(strUrl, StandardCharsets.UTF_8.name())); } if (proxyurl == null) { @@ -269,7 +269,7 @@ public class UrlProxyServlet extends ProxyServlet implements Servlet { byte[] sbb; if (doc.charset() == null) { sbb = UTF8.getBytes(doc.toString()); - response.setCharacterEncoding(UTF8.charset.name()); + response.setCharacterEncoding(StandardCharsets.UTF_8.name()); } else { // keep orig charset sbb = doc.toString().getBytes(doc.charset()); response.setCharacterEncoding(doc.charset().name()); diff --git a/source/net/yacy/http/servlets/YaCyProxyServlet.java b/source/net/yacy/http/servlets/YaCyProxyServlet.java index 1b42cbc81..66a8fe4af 100644 --- a/source/net/yacy/http/servlets/YaCyProxyServlet.java +++ b/source/net/yacy/http/servlets/YaCyProxyServlet.java @@ -104,7 +104,7 @@ public class YaCyProxyServlet extends ProxyServlet implements Servlet { try { proxyurl = new URL(strUrl); } catch (final MalformedURLException e) { - proxyurl = new URL(URLDecoder.decode(strUrl, UTF8.charset.name())); + proxyurl = new URL(URLDecoder.decode(strUrl, StandardCharsets.UTF_8.name())); } } @@ -177,9 +177,9 @@ public class YaCyProxyServlet extends ProxyServlet implements Servlet { final StringWriter buffer = new StringWriter(); if (proxyResponseHeader.containsKey(HeaderFramework.TRANSFER_ENCODING) && proxyResponseHeader.get(HeaderFramework.TRANSFER_ENCODING).contains("chunked")) { - FileUtils.copy(new ChunkedInputStream(proxyout), buffer, UTF8.charset); + FileUtils.copy(new ChunkedInputStream(proxyout), buffer, StandardCharsets.UTF_8); } else { - FileUtils.copy(proxyout, buffer, UTF8.charset); + FileUtils.copy(proxyout, buffer, StandardCharsets.UTF_8); } final String sbuffer = buffer.toString();