format issues

apache · Oct 28, 2023 · 7524b88 · 7524b88
1 parent bad98a2
commit 7524b88
Show file tree

Hide file tree

Showing 14 changed files with 17 additions and 19 deletions.
diff --git a/...ce-client-core/src/main/java/org/apache/hadoop/mapreduce/security/SecureShuffleUtils.java b/...ce-client-core/src/main/java/org/apache/hadoop/mapreduce/security/SecureShuffleUtils.java
@@ -86,7 +86,7 @@ private static boolean verifyHash(byte[] hash, byte[] msg, SecretKey key) {
    */
   public static String hashFromString(String enc_str, SecretKey key) 
   throws IOException {
-    return generateHash(enc_str.getBytes(StandardCharsets.UTF_8), key); 
+    return generateHash(enc_str.getBytes(StandardCharsets.UTF_8), key);
   }
 
   /**

diff --git a/...ask/src/test/java/org/apache/hadoop/mapred/nativetask/buffer/TestByteBufferReadWrite.java b/...ask/src/test/java/org/apache/hadoop/mapred/nativetask/buffer/TestByteBufferReadWrite.java
@@ -19,7 +19,6 @@
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
-import java.io.UnsupportedEncodingException;
 import java.nio.charset.StandardCharsets;
 
 import org.apache.hadoop.mapred.nativetask.NativeDataTarget;

diff --git a/...e-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/pi/Util.java b/...e-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/pi/Util.java
@@ -216,7 +216,8 @@ public static PrintWriter createWriter(File dir, String prefix) throws IOExcepti
       final File f = new File(dir,
           prefix + dateFormat.format(new Date(System.currentTimeMillis())) + ".txt");
       if (!f.exists())
-        return new PrintWriter(new OutputStreamWriter(new FileOutputStream(f), StandardCharsets.UTF_8));
+        return new PrintWriter(new OutputStreamWriter(
+                new FileOutputStream(f), StandardCharsets.UTF_8));
 
       try {Thread.sleep(10);} catch (InterruptedException e) {}
     }
@@ -310,13 +311,14 @@ static List<TaskResult> readJobOutputs(FileSystem fs, Path outdir) throws IOExce
   static void writeResults(String name, List<TaskResult> results, FileSystem fs, String dir) throws IOException {
     final Path outfile = new Path(dir, name + ".txt");
     Util.out.println(name + "> writing results to " + outfile);
-    final PrintWriter out = new PrintWriter(new OutputStreamWriter(fs.create(outfile), StandardCharsets.UTF_8), true);
+    final PrintWriter printWriter = new PrintWriter(new OutputStreamWriter(
+            fs.create(outfile), StandardCharsets.UTF_8), true);
     try {
       for(TaskResult r : results)
-        out.println(r);
+        printWriter.println(r);
     }
     finally {
-      out.close();
+      printWriter.close();
     }
   }
 

diff --git a/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/util/Exec.java b/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/util/Exec.java
@@ -19,7 +19,6 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.io.UnsupportedEncodingException;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;

diff --git a/...re/src/test/java/org/apache/hadoop/fs/azurebfs/TestAbfsConfigurationFieldsValidation.java b/...re/src/test/java/org/apache/hadoop/fs/azurebfs/TestAbfsConfigurationFieldsValidation.java
@@ -22,7 +22,6 @@
 import java.lang.reflect.Field;
 import java.nio.charset.StandardCharsets;
 
-import org.apache.commons.codec.Charsets;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.azurebfs.constants.ConfigurationKeys;
 import org.apache.hadoop.fs.azurebfs.constants.TestConfigurationKeys;

diff --git a/...p-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/RandomSeedGenerator.java b/...p-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/RandomSeedGenerator.java
@@ -17,7 +17,6 @@
  */
 package org.apache.hadoop.tools.rumen;
 
-import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;

diff --git a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/PipeMapper.java b/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/PipeMapper.java
@@ -76,8 +76,10 @@ public void configure(JobConf job) {
         inputFormatClassName.equals(TextInputFormat.class.getCanonicalName()));
     }
 
-    mapOutputFieldSeparator = job.get("stream.map.output.field.separator", "\t").getBytes(StandardCharsets.UTF_8);
-    mapInputFieldSeparator = job.get("stream.map.input.field.separator", "\t").getBytes(StandardCharsets.UTF_8);
+    mapOutputFieldSeparator = job.get("stream.map.output.field.separator", "\t")
+            .getBytes(StandardCharsets.UTF_8);
+    mapInputFieldSeparator = job.get("stream.map.input.field.separator", "\t")
+            .getBytes(StandardCharsets.UTF_8);
     numOfMapOutputKeyFields = job.getInt("stream.num.map.output.key.fields", 1);
   }
 

diff --git a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/PipeReducer.java b/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/PipeReducer.java
@@ -72,8 +72,10 @@ public void configure(JobConf job) {
     SkipBadRecords.setAutoIncrReducerProcCount(job, false);
     skipping = job.getBoolean(MRJobConfig.SKIP_RECORDS, false);
 
-    reduceOutFieldSeparator = job_.get("stream.reduce.output.field.separator", "\t").getBytes(StandardCharsets.UTF_8);
-    reduceInputFieldSeparator = job_.get("stream.reduce.input.field.separator", "\t").getBytes(StandardCharsets.UTF_8);
+    reduceOutFieldSeparator = job_.get("stream.reduce.output.field.separator", "\t")
+            .getBytes(StandardCharsets.UTF_8);
+    reduceInputFieldSeparator = job_.get("stream.reduce.input.field.separator", "\t")
+            .getBytes(StandardCharsets.UTF_8);
     this.numOfReduceOutputKeyFields = job_.getInt("stream.num.reduce.output.key.fields", 1);
   }
 

diff --git a/...tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/io/TextOutputReader.java b/...tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/io/TextOutputReader.java
@@ -21,7 +21,6 @@
 import java.io.DataInput;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
 import java.nio.charset.CharacterCodingException;
 import java.nio.charset.StandardCharsets;
 

diff --git a/...streaming/src/main/java/org/apache/hadoop/streaming/mapreduce/StreamBaseRecordReader.java b/...streaming/src/main/java/org/apache/hadoop/streaming/mapreduce/StreamBaseRecordReader.java
@@ -19,6 +19,7 @@
 package org.apache.hadoop.streaming.mapreduce;
 
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -107,7 +108,7 @@ void numRecStats(byte[] record, int start, int len) throws IOException {
     numRec_++;
     if (numRec_ == nextStatusRec_) {
       String recordStr = new String(record, start, Math.min(len,
-          statusMaxRecordChars_), "UTF-8");
+          statusMaxRecordChars_), StandardCharsets.UTF_8);
       nextStatusRec_ += 100;// *= 10;
       String status = getStatus(recordStr);
       LOG.info(status);

diff --git a/...p-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/ClusterCLI.java b/...p-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/ClusterCLI.java
@@ -23,7 +23,6 @@
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
 import java.io.UnsupportedEncodingException;
-import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;

diff --git a/...doop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/NodeCLI.java b/...doop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/cli/NodeCLI.java
@@ -21,7 +21,6 @@
 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.ArrayList;
 import java.util.Collections;

diff --git a/.../hadoop/yarn/logaggregation/filecontroller/ifile/LogAggregationIndexedFileController.java b/.../hadoop/yarn/logaggregation/filecontroller/ifile/LogAggregationIndexedFileController.java
@@ -26,7 +26,6 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.Serializable;
-import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;

diff --git a/.../apache/hadoop/yarn/server/nodemanager/containermanager/launcher/TestContainerLaunch.java b/.../apache/hadoop/yarn/server/nodemanager/containermanager/launcher/TestContainerLaunch.java
@@ -35,7 +35,6 @@
 import java.io.PrintStream;
 import java.io.PrintWriter;
 import java.nio.ByteBuffer;
-import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Paths;