You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aurora.apache.org by jo...@apache.org on 2018/02/28 18:42:03 UTC
aurora git commit: Use StandardCharset instead of Charset.forName in
ApiModule
Repository: aurora
Updated Branches:
refs/heads/master e3f496a65 -> e61d7d7b4
Use StandardCharset instead of Charset.forName in ApiModule
Minor nit, use the StandardCharset constant for UTF-8 as opposed to creating it ourselves.
Reviewed at https://reviews.apache.org/r/65761/
Project: http://git-wip-us.apache.org/repos/asf/aurora/repo
Commit: http://git-wip-us.apache.org/repos/asf/aurora/commit/e61d7d7b
Tree: http://git-wip-us.apache.org/repos/asf/aurora/tree/e61d7d7b
Diff: http://git-wip-us.apache.org/repos/asf/aurora/diff/e61d7d7b
Branch: refs/heads/master
Commit: e61d7d7b44f191c2960627b5fb4592fffdf9d8ca
Parents: e3f496a
Author: Jordan Ly <jo...@gmail.com>
Authored: Wed Feb 28 10:41:32 2018 -0800
Committer: Jordan Ly <jl...@twitter.com>
Committed: Wed Feb 28 10:41:32 2018 -0800
----------------------------------------------------------------------
.../org/apache/aurora/scheduler/http/api/ApiModule.java | 4 ++--
.../java/org/apache/aurora/scheduler/http/api/ApiIT.java | 11 +++++++----
2 files changed, 9 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aurora/blob/e61d7d7b/src/main/java/org/apache/aurora/scheduler/http/api/ApiModule.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/aurora/scheduler/http/api/ApiModule.java b/src/main/java/org/apache/aurora/scheduler/http/api/ApiModule.java
index 09950a7..826aa84 100644
--- a/src/main/java/org/apache/aurora/scheduler/http/api/ApiModule.java
+++ b/src/main/java/org/apache/aurora/scheduler/http/api/ApiModule.java
@@ -13,7 +13,7 @@
*/
package org.apache.aurora.scheduler.http.api;
-import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
import javax.inject.Singleton;
import com.beust.jcommander.Parameter;
@@ -43,7 +43,7 @@ public class ApiModule extends ServletModule {
.create("application", "vnd.apache.thrift.json");
private static final MediaType THRIFT_JSON_UTF_8 = MediaType
.create("application", "vnd.apache.thrift.json")
- .withCharset(Charset.forName("UTF-8"));
+ .withCharset(StandardCharsets.UTF_8);
private static final MediaType THRIFT_BINARY = MediaType
.create("application", "vnd.apache.thrift.binary");
http://git-wip-us.apache.org/repos/asf/aurora/blob/e61d7d7b/src/test/java/org/apache/aurora/scheduler/http/api/ApiIT.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/aurora/scheduler/http/api/ApiIT.java b/src/test/java/org/apache/aurora/scheduler/http/api/ApiIT.java
index 910af28..cae566b 100644
--- a/src/test/java/org/apache/aurora/scheduler/http/api/ApiIT.java
+++ b/src/test/java/org/apache/aurora/scheduler/http/api/ApiIT.java
@@ -13,6 +13,7 @@
*/
package org.apache.aurora.scheduler.http.api;
+import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import java.util.List;
import java.util.function.Function;
@@ -103,18 +104,20 @@ public class ApiIT extends AbstractJettyTest {
// We also want to ensure charset parsing is case-insensitive because different browsers have
// different default behaviors (Chrome and Safari will change charset to all uppercase, while
// Firefox may leave it lowercase.
+ String upperUTF8 = StandardCharsets.UTF_8.name().toUpperCase();
ClientResponse upperCaseUTF = getPlainRequestBuilder(ApiModule.API_PATH)
- .type("application/vnd.apache.thrift.json; charset=UTF-8")
- .accept("application/vnd.apache.thrift.json; charset=UTF-8")
+ .type("application/vnd.apache.thrift.json; charset=" + upperUTF8)
+ .accept("application/vnd.apache.thrift.json; charset=" + upperUTF8)
.post(ClientResponse.class, JSON_FIXTURE);
assertEquals(SC_OK, upperCaseUTF.getStatus());
assertEquals(
"application/vnd.apache.thrift.json",
upperCaseUTF.getHeaders().getFirst(CONTENT_TYPE));
+ String lowerUTF8 = StandardCharsets.UTF_8.name().toLowerCase();
ClientResponse lowerCaseUTF = getPlainRequestBuilder(ApiModule.API_PATH)
- .type("application/vnd.apache.thrift.json; charset=utf-8")
- .accept("application/vnd.apache.thrift.json; charset=utf-8")
+ .type("application/vnd.apache.thrift.json; charset=" + lowerUTF8)
+ .accept("application/vnd.apache.thrift.json; charset=" + lowerUTF8)
.post(ClientResponse.class, JSON_FIXTURE);
assertEquals(SC_OK, lowerCaseUTF.getStatus());
assertEquals(