This is an automated email from the ASF dual-hosted git repository. mblow pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit 05ae626f3b0ed43f86cd65ebdf06d6effb04d4af Author: Michael Blow <[email protected]> AuthorDate: Wed Apr 22 20:21:11 2020 -0400 [NO ISSUE][HTTP] Http Encoding refactoring / cleanup Change-Id: I1e6eef71f4f17a7563f182400dd1e815e4a6b8ff Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/5943 Integration-Tests: Jenkins <[email protected]> Tested-by: Jenkins <[email protected]> Reviewed-by: Michael Blow <[email protected]> Contrib: Michael Blow <[email protected]> --- .../java/org/apache/asterix/api/http/server/ApiServlet.java | 3 ++- .../apache/asterix/api/http/server/RebalanceApiServlet.java | 3 ++- .../org/apache/hyracks/http/server/AbstractServlet.java | 3 ++- .../java/org/apache/hyracks/http/server/utils/HttpUtil.java | 13 +++---------- 4 files changed, 9 insertions(+), 13 deletions(-) diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/ApiServlet.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/ApiServlet.java index aff7441..b6ac3f1 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/ApiServlet.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/ApiServlet.java @@ -27,6 +27,7 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.io.OutputStream; import java.io.PrintWriter; +import java.nio.charset.StandardCharsets; import java.util.List; import java.util.concurrent.ConcurrentMap; @@ -204,7 +205,7 @@ public class ApiServlet extends AbstractServlet { } String type = HttpUtil.mime(StaticResourceServlet.extension(resourcePath)); HttpUtil.setContentType(response, "".equals(type) ? HttpUtil.ContentType.TEXT_PLAIN : type, - HttpUtil.Encoding.UTF8); + StandardCharsets.UTF_8); writeOutput(response, is, resourcePath); } catch (IOException e) { LOGGER.log(Level.WARN, "Failure handling request", e); diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/RebalanceApiServlet.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/RebalanceApiServlet.java index 320c7aa..e7afd44 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/RebalanceApiServlet.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/RebalanceApiServlet.java @@ -21,6 +21,7 @@ package org.apache.asterix.api.http.server; import static org.apache.asterix.api.http.server.ServletConstants.HYRACKS_CONNECTION_ATTR; import java.io.PrintWriter; +import java.nio.charset.StandardCharsets; import java.util.ArrayDeque; import java.util.ArrayList; import java.util.Arrays; @@ -169,7 +170,7 @@ public class RebalanceApiServlet extends AbstractServlet { CountDownLatch terminated) { try { // Sets the content type. - HttpUtil.setContentType(response, HttpUtil.ContentType.APPLICATION_JSON, HttpUtil.Encoding.UTF8); + HttpUtil.setContentType(response, HttpUtil.ContentType.APPLICATION_JSON, StandardCharsets.UTF_8); if (datasetName == null) { // Rebalances datasets in a given dataverse or all non-metadata datasets. diff --git a/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/AbstractServlet.java b/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/AbstractServlet.java index 21653c8..3977207 100644 --- a/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/AbstractServlet.java +++ b/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/AbstractServlet.java @@ -22,6 +22,7 @@ import static com.fasterxml.jackson.databind.MapperFeature.SORT_PROPERTIES_ALPHA import static com.fasterxml.jackson.databind.SerializationFeature.ORDER_MAP_ENTRIES_BY_KEYS; import java.io.IOException; +import java.nio.charset.StandardCharsets; import java.util.Arrays; import java.util.concurrent.ConcurrentMap; @@ -113,7 +114,7 @@ public abstract class AbstractServlet implements IServlet { protected void sendError(IServletResponse response, HttpResponseStatus status, String message) throws IOException { response.setStatus(status); - HttpUtil.setContentType(response, HttpUtil.ContentType.TEXT_PLAIN, HttpUtil.Encoding.UTF8); + HttpUtil.setContentType(response, HttpUtil.ContentType.TEXT_PLAIN, StandardCharsets.UTF_8); if (message != null) { response.writer().println(message); } diff --git a/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/utils/HttpUtil.java b/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/utils/HttpUtil.java index 8451898..2c9790e 100644 --- a/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/utils/HttpUtil.java +++ b/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/utils/HttpUtil.java @@ -90,12 +90,12 @@ public class HttpUtil { public static Charset setContentType(IServletResponse response, String type, IServletRequest fromRequest) throws IOException { Charset preferredCharset = getPreferredCharset(fromRequest); - response.setHeader(HttpHeaderNames.CONTENT_TYPE, type + "; charset=" + preferredCharset.name()); + setContentType(response, type, preferredCharset); return preferredCharset; } - public static void setContentType(IServletResponse response, String type, String charset) throws IOException { - response.setHeader(HttpHeaderNames.CONTENT_TYPE, type + "; charset=" + charset); + public static void setContentType(IServletResponse response, String type, Charset charset) throws IOException { + response.setHeader(HttpHeaderNames.CONTENT_TYPE, type + "; charset=" + charset.name()); } public static void setContentType(IServletResponse response, String type) throws IOException { @@ -184,13 +184,6 @@ public class HttpUtil { return i < 0 ? uri : uri.substring(0, i); } - public static class Encoding { - public static final String UTF8 = "utf-8"; - - private Encoding() { - } - } - public static class ContentType { public static final String APPLICATION_ADM = "application/x-adm"; public static final String APPLICATION_JSON = "application/json";
