Procházet zdrojové kódy

YARN-11647. use StandardCharsets.UTF_8 (#6447) Contributed by PJ Fanning.

Signed-off-by: Shilun Fan <slfan1989@apache.org>
PJ Fanning před 1 rokem
rodič
revize
04e447cfa7

+ 2 - 3
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/QueueCLI.java

@@ -20,7 +20,6 @@ package org.apache.hadoop.yarn.client.cli;
 import java.io.IOException;
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
-import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.text.DecimalFormat;
 import java.util.Arrays;
@@ -168,7 +167,7 @@ public class QueueCLI extends YarnCLI {
       throws YarnException, IOException {
     int rc;
     PrintWriter writer = new PrintWriter(
-        new OutputStreamWriter(sysout, Charset.forName("UTF-8")));
+        new OutputStreamWriter(sysout, StandardCharsets.UTF_8));
     QueueInfo queueInfo = client.getQueueInfo(queueName, subClusterId);
     if (queueInfo != null) {
       if (isYarnFederationEnabled(getConf())) {
@@ -200,7 +199,7 @@ public class QueueCLI extends YarnCLI {
   private int listChildQueues(String parentQueueName) throws IOException, YarnException {
     int exitCode;
     PrintWriter writer = new PrintWriter(new OutputStreamWriter(
-        sysout, Charset.forName(StandardCharsets.UTF_8.name())));
+        sysout, StandardCharsets.UTF_8));
     if (parentQueueName.equalsIgnoreCase(ALLTAG)) {
       List<QueueInfo> queueInfos = client.getAllQueues();
       if (queueInfos != null) {

+ 3 - 4
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/RouterCLI.java

@@ -72,7 +72,6 @@ import java.io.File;
 import java.io.IOException;
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
-import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.ArrayList;
@@ -483,7 +482,7 @@ public class RouterCLI extends Configured implements Tool {
 
   private int handleGetSubClusters() throws IOException, YarnException {
     PrintWriter writer = new PrintWriter(new OutputStreamWriter(
-        System.out, Charset.forName(StandardCharsets.UTF_8.name())));
+        System.out, StandardCharsets.UTF_8));
     ResourceManagerAdministrationProtocol adminProtocol = createAdminProtocol();
     GetSubClustersRequest request = GetSubClustersRequest.newInstance();
     GetSubClustersResponse response = adminProtocol.getFederationSubClusters(request);
@@ -527,7 +526,7 @@ public class RouterCLI extends Configured implements Tool {
   private int deregisterSubCluster(String subClusterId)
       throws IOException, YarnException {
     PrintWriter writer = new PrintWriter(new OutputStreamWriter(
-        System.out, Charset.forName(StandardCharsets.UTF_8.name())));
+        System.out, StandardCharsets.UTF_8));
     ResourceManagerAdministrationProtocol adminProtocol = createAdminProtocol();
     DeregisterSubClusterRequest request =
         DeregisterSubClusterRequest.newInstance(subClusterId);
@@ -911,7 +910,7 @@ public class RouterCLI extends Configured implements Tool {
         pageSize, currentPage, queue, queues);
     try {
       PrintWriter writer = new PrintWriter(new OutputStreamWriter(
-          System.out, Charset.forName(StandardCharsets.UTF_8.name())));
+          System.out, StandardCharsets.UTF_8));
       QueryFederationQueuePoliciesRequest request =
           QueryFederationQueuePoliciesRequest.newInstance(pageSize, currentPage, queue, queues);
       ResourceManagerAdministrationProtocol adminProtocol = createAdminProtocol();