MAPREDUCE-7384. impove import * In MapReduce Project.

apache · Jun 1, 2022 · 53e8b3a · 53e8b3a
1 parent 6488b22
commit 53e8b3a
Show file tree

Hide file tree

Showing 9 changed files with 41 additions and 17 deletions.
diff --git a/...reduce-client-app/src/test/java/org/apache/hadoop/mapred/TestTaskAttemptListenerImpl.java b/...reduce-client-app/src/test/java/org/apache/hadoop/mapred/TestTaskAttemptListenerImpl.java
@@ -69,8 +69,20 @@
 import org.mockito.junit.MockitoJUnitRunner;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.*;
-import static org.mockito.Mockito.*;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.eq;
+import static org.mockito.Mockito.doReturn;
 
 /**
  * Tests the behavior of TaskAttemptListenerImpl.

diff --git a/...ent/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapred/TestYarnChild.java b/...ent/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapred/TestYarnChild.java
@@ -24,7 +24,12 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.anyString;
+import static org.mockito.Mockito.eq;
 
 /**
  * Tests the behavior of YarnChild.

diff --git a/...reduce-client-common/src/test/java/org/apache/hadoop/mapred/TestLocalModeWithNewApis.java b/...reduce-client-common/src/test/java/org/apache/hadoop/mapred/TestLocalModeWithNewApis.java
@@ -17,7 +17,8 @@
  */
 package org.apache.hadoop.mapred;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 import java.io.BufferedReader;
 import java.io.DataOutputStream;

diff --git a/...duce-client-common/src/test/java/org/apache/hadoop/mapred/TestMRWithDistributedCache.java b/...duce-client-common/src/test/java/org/apache/hadoop/mapred/TestMRWithDistributedCache.java
@@ -29,7 +29,8 @@
 
 import org.junit.Assert;
 import org.junit.Test;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
 
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.filecache.DistributedCache;

diff --git a/...lient-core/src/main/java/org/apache/hadoop/mapred/DeprecatedQueueConfigurationParser.java b/...lient-core/src/main/java/org/apache/hadoop/mapred/DeprecatedQueueConfigurationParser.java
@@ -22,7 +22,8 @@
 import org.apache.hadoop.mapreduce.MRConfig;
 import org.apache.hadoop.mapreduce.QueueState;
 import org.apache.hadoop.security.authorize.AccessControlList;
-import static org.apache.hadoop.mapred.QueueManager.*;
+import static org.apache.hadoop.mapred.QueueManager.QUEUE_CONF_FILE_NAME;
+import static org.apache.hadoop.mapred.QueueManager.toFullPropertyName;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/...apreduce-client-core/src/main/java/org/apache/hadoop/mapred/SequenceFileRecordReader.java b/...apreduce-client-core/src/main/java/org/apache/hadoop/mapred/SequenceFileRecordReader.java
@@ -26,7 +26,7 @@
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.io.*;
+import org.apache.hadoop.io.SequenceFile;
 import org.apache.hadoop.util.ReflectionUtils;
 
 /** 

diff --git a/.../hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/TextInputFormat.java b/.../hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/TextInputFormat.java
@@ -18,14 +18,17 @@
 
 package org.apache.hadoop.mapred;
 
-import java.io.*;
+import java.io.IOException;
 
 import org.apache.hadoop.classification.InterfaceAudience;
 import org.apache.hadoop.classification.InterfaceStability;
-import org.apache.hadoop.fs.*;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.io.LongWritable;
 import org.apache.hadoop.io.Text;
-import org.apache.hadoop.io.compress.*;
+import org.apache.hadoop.io.compress.CompressionCodecFactory;
+import org.apache.hadoop.io.compress.CompressionCodec;
+import org.apache.hadoop.io.compress.SplittableCompressionCodec;
 
 import org.apache.hadoop.thirdparty.com.google.common.base.Charsets;
 

diff --git a/...hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/TextOutputFormat.java b/...hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/TextOutputFormat.java
@@ -32,7 +32,8 @@
 import org.apache.hadoop.io.Text;
 import org.apache.hadoop.io.compress.CompressionCodec;
 import org.apache.hadoop.io.compress.GzipCodec;
-import org.apache.hadoop.util.*;
+import org.apache.hadoop.util.Progressable;
+import org.apache.hadoop.util.ReflectionUtils;
 
 /** 
  * An {@link OutputFormat} that writes plain text files. 
@@ -42,7 +43,7 @@
 public class TextOutputFormat<K, V> extends FileOutputFormat<K, V> {
 
   protected static class LineRecordWriter<K, V>
-    implements RecordWriter<K, V> {
+      implements RecordWriter<K, V> {
     private static final byte[] NEWLINE =
       "\n".getBytes(StandardCharsets.UTF_8);
 
@@ -75,7 +76,7 @@ private void writeObject(Object o) throws IOException {
     }
 
     public synchronized void write(K key, V value)
-      throws IOException {
+        throws IOException {
 
       boolean nullKey = key == null || key instanceof NullWritable;
       boolean nullValue = value == null || value instanceof NullWritable;
@@ -103,7 +104,7 @@ public RecordWriter<K, V> getRecordWriter(FileSystem ignored,
                                                   JobConf job,
                                                   String name,
                                                   Progressable progress)
-    throws IOException {
+      throws IOException {
     boolean isCompressed = getCompressOutput(job);
     String keyValueSeparator = job.get("mapreduce.output.textoutputformat.separator", 
                                        "\t");
@@ -114,12 +115,12 @@ public RecordWriter<K, V> getRecordWriter(FileSystem ignored,
       return new LineRecordWriter<K, V>(fileOut, keyValueSeparator);
     } else {
       Class<? extends CompressionCodec> codecClass =
-        getOutputCompressorClass(job, GzipCodec.class);
+          getOutputCompressorClass(job, GzipCodec.class);
       // create the named codec
       CompressionCodec codec = ReflectionUtils.newInstance(codecClass, job);
       // build the filename including the extension
       Path file = 
-        FileOutputFormat.getTaskOutputPath(job, 
+          FileOutputFormat.getTaskOutputPath(job,
                                            name + codec.getDefaultExtension());
       FileSystem fs = file.getFileSystem(job);
       FSDataOutputStream fileOut = fs.create(file, progress);

diff --git a/...client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestClock.java b/...client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestClock.java
@@ -20,7 +20,7 @@
 
 import org.junit.Test;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 /**
  *  test Clock class
  *