Import sorting

Author: mccheah

core/src/main/java/org/apache/spark/shuffle/sort/UnsafeShuffleWriter.java

@@ -24,8 +24,6 @@
 import java.nio.channels.WritableByteChannel;
 import java.util.Iterator;
 
-import org.apache.spark.shuffle.api.ShuffleExecutorComponents;
-import org.apache.spark.shuffle.api.WritableByteChannelWrapper;
 import scala.Option;
 import scala.Product2;
 import scala.collection.JavaConverters;
@@ -54,6 +52,8 @@
 import org.apache.spark.serializer.SerializationStream;
 import org.apache.spark.serializer.SerializerInstance;
 import org.apache.spark.shuffle.ShuffleWriter;
+import org.apache.spark.shuffle.api.ShuffleExecutorComponents;
+import org.apache.spark.shuffle.api.WritableByteChannelWrapper;
 import org.apache.spark.storage.BlockManager;
 import org.apache.spark.unsafe.Platform;
 import org.apache.spark.util.Utils;

core/src/test/java/org/apache/spark/shuffle/sort/UnsafeShuffleWriterSuite.java

@@ -22,7 +22,6 @@
 import java.nio.file.Files;
 import java.util.*;
 
-import org.apache.spark.shuffle.sort.io.LocalDiskShuffleExecutorComponents;
 import org.mockito.stubbing.Answer;
 import scala.Option;
 import scala.Product2;
@@ -42,7 +41,6 @@
 import org.apache.spark.ShuffleDependency;
 import org.apache.spark.SparkConf;
 import org.apache.spark.TaskContext;
-import org.apache.spark.TaskContext$;
 import org.apache.spark.executor.ShuffleWriteMetrics;
 import org.apache.spark.executor.TaskMetrics;
 import org.apache.spark.io.CompressionCodec$;
@@ -57,6 +55,7 @@
 import org.apache.spark.security.CryptoStreamUtils;
 import org.apache.spark.serializer.*;
 import org.apache.spark.shuffle.IndexShuffleBlockResolver;
+import org.apache.spark.shuffle.sort.io.LocalDiskShuffleExecutorComponents;
 import org.apache.spark.storage.*;
 import org.apache.spark.util.Utils;