Skip to content

Commit f98df7e

Browse files
author
Gary Gregory
committed
Organize imports.
1 parent b38cf8a commit f98df7e

13 files changed

Lines changed: 17 additions & 21 deletions

src/main/java/org/apache/commons/io/input/BOMInputStream.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import java.util.Arrays;
2424
import java.util.Comparator;
2525
import java.util.List;
26+
2627
import org.apache.commons.io.ByteOrderMark;
2728
import org.apache.commons.io.IOUtils;
2829

src/main/java/org/apache/commons/io/input/QueueInputStream.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@
1818

1919
import static org.apache.commons.io.IOUtils.EOF;
2020

21-
import org.apache.commons.io.output.QueueOutputStream;
22-
2321
import java.io.InputStream;
2422
import java.io.PipedInputStream;
2523
import java.io.PipedOutputStream;
2624
import java.util.Objects;
2725
import java.util.concurrent.BlockingQueue;
2826
import java.util.concurrent.LinkedBlockingQueue;
2927

28+
import org.apache.commons.io.output.QueueOutputStream;
29+
3030
/**
3131
* Simple alternative to JDK {@link java.io.PipedInputStream}; queue input stream provides what's written in queue
3232
* output stream.

src/main/java/org/apache/commons/io/input/UnsynchronizedByteArrayInputStream.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616
*/
1717
package org.apache.commons.io.input;
1818

19+
import static java.lang.Math.min;
20+
1921
import java.io.InputStream;
2022
import java.util.Objects;
2123

22-
import static java.lang.Math.min;
23-
2424
/**
2525
* This is an alternative to {@link java.io.ByteArrayInputStream}
2626
* which removes the synchronization overhead for non-concurrent

src/main/java/org/apache/commons/io/output/AbstractByteArrayOutputStream.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,10 @@
1616
*/
1717
package org.apache.commons.io.output;
1818

19-
import org.apache.commons.io.IOUtils;
20-
import org.apache.commons.io.input.ClosedInputStream;
19+
import static org.apache.commons.io.IOUtils.EOF;
2120

22-
import java.io.InputStream;
2321
import java.io.IOException;
22+
import java.io.InputStream;
2423
import java.io.OutputStream;
2524
import java.io.SequenceInputStream;
2625
import java.io.UnsupportedEncodingException;
@@ -29,7 +28,8 @@
2928
import java.util.Collections;
3029
import java.util.List;
3130

32-
import static org.apache.commons.io.IOUtils.EOF;
31+
import org.apache.commons.io.IOUtils;
32+
import org.apache.commons.io.input.ClosedInputStream;
3333

3434
/**
3535
* This is the base class for implementing an output stream in which the data

src/main/java/org/apache/commons/io/output/QueueOutputStream.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616
*/
1717
package org.apache.commons.io.output;
1818

19-
import org.apache.commons.io.input.QueueInputStream;
20-
2119
import java.io.InterruptedIOException;
2220
import java.io.OutputStream;
2321
import java.io.PipedInputStream;
@@ -26,6 +24,8 @@
2624
import java.util.concurrent.BlockingQueue;
2725
import java.util.concurrent.LinkedBlockingQueue;
2826

27+
import org.apache.commons.io.input.QueueInputStream;
28+
2929
/**
3030
* Simple alternative to JDK {@link java.io.PipedOutputStream}; queue input stream provides what's written in queue
3131
* output stream.

src/main/java/org/apache/commons/io/output/UnsynchronizedByteArrayOutputStream.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@
1616
*/
1717
package org.apache.commons.io.output;
1818

19-
import org.apache.commons.io.input.UnsynchronizedByteArrayInputStream;
20-
2119
import java.io.IOException;
2220
import java.io.InputStream;
2321
import java.io.OutputStream;
2422

23+
import org.apache.commons.io.input.UnsynchronizedByteArrayInputStream;
24+
2525
/**
2626
* Implements a version of {@link AbstractByteArrayOutputStream} <b>without</b> any concurrent thread safety.
2727
*

src/test/java/org/apache/commons/io/DemuxTestCase.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import static org.junit.jupiter.api.Assertions.assertEquals;
2020
import static org.junit.jupiter.api.Assertions.assertNotNull;
2121

22-
import java.io.ByteArrayInputStream;
2322
import java.io.InputStream;
2423
import java.io.OutputStream;
2524
import java.nio.charset.StandardCharsets;

src/test/java/org/apache/commons/io/filefilter/AndFileFilterTestCase.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@
1616
*/
1717
package org.apache.commons.io.filefilter;
1818

19+
import static org.junit.jupiter.api.Assertions.assertEquals;
20+
1921
import java.util.ArrayList;
2022
import java.util.Collections;
2123
import java.util.List;
2224

2325
import org.junit.jupiter.api.BeforeEach;
2426
import org.junit.jupiter.api.Test;
2527

26-
import static org.junit.jupiter.api.Assertions.assertEquals;
27-
2828
/**
2929
* Tests {@link AndFileFilter}.
3030
*/

src/test/java/org/apache/commons/io/input/CountingInputStreamTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121

2222
import java.io.ByteArrayInputStream;
2323
import java.io.IOException;
24-
import java.io.InputStream;
2524

2625
import org.apache.commons.io.IOUtils;
2726
import org.junit.jupiter.api.Test;

src/test/java/org/apache/commons/io/input/ObservableInputStreamTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
import static org.junit.jupiter.api.Assertions.assertEquals;
2020
import static org.junit.jupiter.api.Assertions.assertNotEquals;
2121
import static org.junit.jupiter.api.Assertions.assertNull;
22-
import static org.junit.jupiter.api.Assertions.assertTrue;
2322
import static org.junit.jupiter.api.Assertions.assertThrows;
23+
import static org.junit.jupiter.api.Assertions.assertTrue;
2424

2525
import java.io.ByteArrayInputStream;
2626
import java.io.IOException;

0 commit comments

Comments
 (0)