From 14b28a3103cc53c915f7b2a01306ea37c4ab0852 Mon Sep 17 00:00:00 2001 From: Ashutosh Gupta Date: Wed, 3 Aug 2022 22:39:08 +0100 Subject: [PATCH] HADOOP-18390. Fix out of sync import for HADOOP-18321 --- .../io/compress/bzip2/BZip2TextFileWriter.java | 6 +++--- .../hadoop/io/compress/bzip2/BZip2Utils.java | 4 ++-- .../compress/bzip2/TestBZip2TextFileWriter.java | 6 +++--- .../input/BaseTestLineRecordReaderBZip2.java | 17 +++++++++-------- 4 files changed, 17 insertions(+), 16 deletions(-) diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/bzip2/BZip2TextFileWriter.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/bzip2/BZip2TextFileWriter.java index e40f631b6032f..5ca99fd02dfbf 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/bzip2/BZip2TextFileWriter.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/bzip2/BZip2TextFileWriter.java @@ -18,9 +18,6 @@ package org.apache.hadoop.io.compress.bzip2; -import static org.apache.hadoop.io.compress.bzip2.CBZip2OutputStream.MIN_BLOCKSIZE; -import static org.apache.hadoop.util.Preconditions.checkArgument; - import java.io.Closeable; import java.io.IOException; import java.io.OutputStream; @@ -30,6 +27,9 @@ import org.apache.hadoop.fs.Path; import org.apache.hadoop.io.compress.BZip2Codec; +import static org.apache.hadoop.io.compress.bzip2.CBZip2OutputStream.MIN_BLOCKSIZE; +import static org.apache.hadoop.util.Preconditions.checkArgument; + /** * A writer that simplifies creating BZip2 compressed text data for testing * purposes. diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/bzip2/BZip2Utils.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/bzip2/BZip2Utils.java index 717b282797e2c..d597ed0e7e0b8 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/bzip2/BZip2Utils.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/bzip2/BZip2Utils.java @@ -18,8 +18,6 @@ package org.apache.hadoop.io.compress.bzip2; -import static org.apache.hadoop.io.compress.SplittableCompressionCodec.READ_MODE.BYBLOCK; - import java.io.IOException; import java.io.InputStream; import java.util.ArrayList; @@ -29,6 +27,8 @@ import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; +import static org.apache.hadoop.io.compress.SplittableCompressionCodec.READ_MODE.BYBLOCK; + public final class BZip2Utils { private BZip2Utils() { diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/bzip2/TestBZip2TextFileWriter.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/bzip2/TestBZip2TextFileWriter.java index 9b36f899b6d45..7d92e07f01b6a 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/bzip2/TestBZip2TextFileWriter.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/bzip2/TestBZip2TextFileWriter.java @@ -17,9 +17,6 @@ */ package org.apache.hadoop.io.compress.bzip2; -import static org.apache.hadoop.io.compress.bzip2.BZip2TextFileWriter.BLOCK_SIZE; -import static org.junit.Assert.assertEquals; - import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -29,6 +26,9 @@ import org.junit.Before; import org.junit.Test; +import static org.apache.hadoop.io.compress.bzip2.BZip2TextFileWriter.BLOCK_SIZE; +import static org.junit.Assert.assertEquals; + public final class TestBZip2TextFileWriter { private static final byte[] DELIMITER = new byte[] {'\0'}; diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/lib/input/BaseTestLineRecordReaderBZip2.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/lib/input/BaseTestLineRecordReaderBZip2.java index cd400365efa5e..da6bedde13149 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/lib/input/BaseTestLineRecordReaderBZip2.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/lib/input/BaseTestLineRecordReaderBZip2.java @@ -17,23 +17,24 @@ */ package org.apache.hadoop.mapreduce.lib.input; -import static org.apache.hadoop.fs.CommonConfigurationKeysPublic.IO_FILE_BUFFER_SIZE_KEY; -import static org.apache.hadoop.io.compress.bzip2.BZip2TextFileWriter.BLOCK_SIZE; -import static org.junit.Assert.assertEquals; - import java.io.IOException; import java.nio.charset.StandardCharsets; import java.util.Arrays; import java.util.List; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; -import org.apache.hadoop.io.compress.bzip2.BZip2Utils; import org.apache.hadoop.io.compress.bzip2.BZip2TextFileWriter; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.apache.hadoop.io.compress.bzip2.BZip2Utils; + +import static org.apache.hadoop.fs.CommonConfigurationKeysPublic.IO_FILE_BUFFER_SIZE_KEY; +import static org.apache.hadoop.io.compress.bzip2.BZip2TextFileWriter.BLOCK_SIZE; +import static org.junit.Assert.assertEquals; public abstract class BaseTestLineRecordReaderBZip2 {