Skip to content

Commit 2128a70

Browse files
authored
refactor: reorder imports (#1344)
1 parent 3585b7c commit 2128a70

File tree

148 files changed

+336
-344
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

148 files changed

+336
-344
lines changed

src/main/java/com/fasterxml/jackson/core/TSFBuilder.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
import com.fasterxml.jackson.core.json.JsonReadFeature;
1010
import com.fasterxml.jackson.core.json.JsonWriteFeature;
1111
import com.fasterxml.jackson.core.util.BufferRecycler;
12-
import com.fasterxml.jackson.core.util.RecyclerPool;
13-
import com.fasterxml.jackson.core.util.JsonRecyclerPools;
1412
import com.fasterxml.jackson.core.util.JsonGeneratorDecorator;
13+
import com.fasterxml.jackson.core.util.JsonRecyclerPools;
14+
import com.fasterxml.jackson.core.util.RecyclerPool;
1515

1616
/**
1717
* Since 2.10, Builder class is offered for creating token stream factories

src/main/java/com/fasterxml/jackson/core/base/ParserBase.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77

88
import com.fasterxml.jackson.core.*;
99
import com.fasterxml.jackson.core.exc.StreamConstraintsException;
10-
import com.fasterxml.jackson.core.io.IOContext;
1110
import com.fasterxml.jackson.core.io.ContentReference;
11+
import com.fasterxml.jackson.core.io.IOContext;
1212
import com.fasterxml.jackson.core.io.NumberInput;
1313
import com.fasterxml.jackson.core.json.DupDetector;
1414
import com.fasterxml.jackson.core.json.JsonReadContext;

src/main/java/com/fasterxml/jackson/core/io/BigDecimalParser.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package com.fasterxml.jackson.core.io;
22

3-
import ch.randelshofer.fastdoubleparser.JavaBigDecimalParser;
4-
53
import java.math.BigDecimal;
64

5+
import ch.randelshofer.fastdoubleparser.JavaBigDecimalParser;
6+
77
/**
88
* Internal Jackson Helper class used to implement more optimized parsing of {@link BigDecimal} for REALLY
99
* big values (over 500 characters).

src/main/java/com/fasterxml/jackson/core/io/BigIntegerParser.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package com.fasterxml.jackson.core.io;
22

3-
import ch.randelshofer.fastdoubleparser.JavaBigIntegerParser;
4-
53
import java.math.BigInteger;
64

5+
import ch.randelshofer.fastdoubleparser.JavaBigIntegerParser;
6+
77
import static com.fasterxml.jackson.core.io.BigDecimalParser.MAX_CHARS_TO_REPORT;
88

99
/**

src/main/java/com/fasterxml/jackson/core/io/NumberInput.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package com.fasterxml.jackson.core.io;
22

3-
import ch.randelshofer.fastdoubleparser.JavaDoubleParser;
4-
import ch.randelshofer.fastdoubleparser.JavaFloatParser;
5-
63
import java.math.BigDecimal;
74
import java.math.BigInteger;
85
import java.util.regex.Pattern;
96

7+
import ch.randelshofer.fastdoubleparser.JavaDoubleParser;
8+
import ch.randelshofer.fastdoubleparser.JavaFloatParser;
9+
1010
/**
1111
* Helper class for efficient parsing of various JSON numbers.
1212
*<p>

src/main/java/com/fasterxml/jackson/core/json/async/NonBlockingByteBufferJsonParser.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
package com.fasterxml.jackson.core.json.async;
22

3-
import com.fasterxml.jackson.core.async.ByteBufferFeeder;
4-
import com.fasterxml.jackson.core.async.NonBlockingInputFeeder;
5-
import com.fasterxml.jackson.core.io.IOContext;
6-
import com.fasterxml.jackson.core.sym.ByteQuadsCanonicalizer;
7-
83
import java.io.IOException;
94
import java.io.OutputStream;
105
import java.nio.ByteBuffer;
116
import java.nio.channels.Channels;
127
import java.nio.channels.WritableByteChannel;
138

9+
import com.fasterxml.jackson.core.async.ByteBufferFeeder;
10+
import com.fasterxml.jackson.core.async.NonBlockingInputFeeder;
11+
import com.fasterxml.jackson.core.io.IOContext;
12+
import com.fasterxml.jackson.core.sym.ByteQuadsCanonicalizer;
13+
1414
/**
1515
* Non-blocking parser implementation for JSON content that takes its input
1616
* via {@link java.nio.ByteBuffer} instance(s) passed.

src/main/java/com/fasterxml/jackson/core/json/async/NonBlockingUtf8JsonParserBase.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package com.fasterxml.jackson.core.json.async;
22

3+
import java.io.IOException;
4+
35
import com.fasterxml.jackson.core.JsonParseException;
46
import com.fasterxml.jackson.core.JsonToken;
57
import com.fasterxml.jackson.core.io.CharTypes;
@@ -8,8 +10,6 @@
810
import com.fasterxml.jackson.core.sym.ByteQuadsCanonicalizer;
911
import com.fasterxml.jackson.core.util.VersionUtil;
1012

11-
import java.io.IOException;
12-
1313
/**
1414
* Non-blocking parser base implementation for JSON content.
1515
*<p>

src/main/java/com/fasterxml/jackson/core/util/JsonGeneratorDelegate.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
package com.fasterxml.jackson.core.util;
22

3-
import com.fasterxml.jackson.core.*;
4-
import com.fasterxml.jackson.core.io.CharacterEscapes;
5-
63
import java.io.IOException;
74
import java.io.InputStream;
85
import java.io.Reader;
96
import java.math.BigDecimal;
107
import java.math.BigInteger;
118

9+
import com.fasterxml.jackson.core.*;
10+
import com.fasterxml.jackson.core.io.CharacterEscapes;
11+
1212
public class JsonGeneratorDelegate extends JsonGenerator
1313
{
1414
/**

src/main/java/com/fasterxml/jackson/core/util/ThreadLocalBufferManager.java

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import java.lang.ref.ReferenceQueue;
44
import java.lang.ref.SoftReference;
5-
65
import java.util.*;
76
import java.util.concurrent.ConcurrentHashMap;
87
import java.util.concurrent.locks.ReentrantLock;

src/test/java/com/fasterxml/jackson/core/ErrorReportConfigurationTest.java

-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import com.fasterxml.jackson.core.io.ContentReference;
66

77
import static org.assertj.core.api.Assertions.assertThat;
8-
98
import static org.junit.jupiter.api.Assertions.assertEquals;
109
import static org.junit.jupiter.api.Assertions.fail;
1110

src/test/java/com/fasterxml/jackson/core/JDKSerializabilityTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
import org.junit.jupiter.api.Test;
66

77
import com.fasterxml.jackson.core.io.ContentReference;
8-
import com.fasterxml.jackson.core.util.RecyclerPool;
98
import com.fasterxml.jackson.core.util.DefaultPrettyPrinter;
109
import com.fasterxml.jackson.core.util.JsonRecyclerPools;
10+
import com.fasterxml.jackson.core.util.RecyclerPool;
1111

1212
import static org.junit.jupiter.api.Assertions.*;
1313

src/test/java/com/fasterxml/jackson/core/JsonLocationTest.java

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import com.fasterxml.jackson.core.io.ContentReference;
1010

1111
import static org.assertj.core.api.Assertions.assertThat;
12-
1312
import static org.junit.jupiter.api.Assertions.*;
1413

1514
/**

src/test/java/com/fasterxml/jackson/core/JsonpCharacterEscapesTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package com.fasterxml.jackson.core;
22

3-
import com.fasterxml.jackson.core.io.SerializedString;
4-
53
import org.junit.jupiter.api.Test;
64

5+
import com.fasterxml.jackson.core.io.SerializedString;
6+
77
import static org.junit.jupiter.api.Assertions.assertEquals;
88

99
/**

src/test/java/com/fasterxml/jackson/core/constraints/LargeDocReadTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
import java.io.IOException;
44

5-
import com.fasterxml.jackson.core.*;
6-
75
import org.junit.jupiter.api.Test;
6+
7+
import com.fasterxml.jackson.core.*;
88
import com.fasterxml.jackson.core.async.AsyncTestBase;
99
import com.fasterxml.jackson.core.exc.StreamConstraintsException;
1010
import com.fasterxml.jackson.core.testsupport.AsyncReaderWrapper;

src/test/java/com/fasterxml/jackson/core/constraints/LargeNameReadTest.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,9 @@
22

33
import java.io.IOException;
44

5-
import com.fasterxml.jackson.core.*;
6-
75
import org.junit.jupiter.api.Test;
8-
import com.fasterxml.jackson.core.StreamReadConstraints;
6+
7+
import com.fasterxml.jackson.core.*;
98
import com.fasterxml.jackson.core.exc.StreamConstraintsException;
109
import com.fasterxml.jackson.core.json.async.NonBlockingJsonParser;
1110

src/test/java/com/fasterxml/jackson/core/constraints/LargeNumberReadTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
import java.math.BigDecimal;
44

5-
import com.fasterxml.jackson.core.*;
6-
75
import org.junit.jupiter.api.Test;
6+
7+
import com.fasterxml.jackson.core.*;
88
import com.fasterxml.jackson.core.exc.StreamConstraintsException;
99

1010
import static org.junit.jupiter.api.Assertions.assertEquals;

src/test/java/com/fasterxml/jackson/core/constraints/LargeNumberWriteTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
import java.math.BigDecimal;
1111
import java.math.BigInteger;
1212

13-
import com.fasterxml.jackson.core.*;
14-
1513
import org.junit.jupiter.api.Test;
1614

15+
import com.fasterxml.jackson.core.*;
16+
1717
import static org.junit.jupiter.api.Assertions.assertEquals;
1818
import static org.junit.jupiter.api.Assertions.assertNull;
1919

src/test/java/com/fasterxml/jackson/core/constraints/TokenCountTest.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,14 @@
22

33
import java.nio.ByteBuffer;
44

5+
import org.junit.jupiter.api.Test;
6+
57
import com.fasterxml.jackson.core.JUnit5TestBase;
68
import com.fasterxml.jackson.core.JsonFactory;
79
import com.fasterxml.jackson.core.JsonParser;
810
import com.fasterxml.jackson.core.StreamReadConstraints;
911
import com.fasterxml.jackson.core.json.async.NonBlockingByteBufferJsonParser;
1012
import com.fasterxml.jackson.core.json.async.NonBlockingJsonParser;
11-
import org.junit.jupiter.api.Test;
1213

1314
import static org.junit.jupiter.api.Assertions.assertEquals;
1415

src/test/java/com/fasterxml/jackson/core/dos/PerfBigDecimalToInteger968Test.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
import org.junit.jupiter.api.Timeout;
77

88
import com.fasterxml.jackson.core.*;
9+
import com.fasterxml.jackson.core.exc.StreamConstraintsException;
910

1011
import static org.junit.jupiter.api.Assertions.assertEquals;
1112
import static org.junit.jupiter.api.Assertions.fail;
12-
import com.fasterxml.jackson.core.exc.StreamConstraintsException;
1313

1414
// For [core#968]]
1515
class PerfBigDecimalToInteger968Test

src/test/java/com/fasterxml/jackson/core/filter/BasicGeneratorFilteringTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
import java.math.BigInteger;
66
import java.util.*;
77

8-
import com.fasterxml.jackson.core.*;
9-
108
import org.junit.jupiter.api.Test;
9+
10+
import com.fasterxml.jackson.core.*;
1111
import com.fasterxml.jackson.core.filter.TokenFilter.Inclusion;
1212
import com.fasterxml.jackson.core.io.SerializedString;
1313

src/test/java/com/fasterxml/jackson/core/filter/BasicParserFilteringTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
import java.math.BigInteger;
44
import java.util.*;
55

6-
import com.fasterxml.jackson.core.*;
7-
86
import org.junit.jupiter.api.Test;
7+
8+
import com.fasterxml.jackson.core.*;
99
import com.fasterxml.jackson.core.filter.TokenFilter.Inclusion;
1010

1111
import static org.junit.jupiter.api.Assertions.*;

src/test/java/com/fasterxml/jackson/core/filter/GeneratorFiltering609Test.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
import java.io.*;
44

5-
import com.fasterxml.jackson.core.*;
6-
75
import org.junit.jupiter.api.Test;
6+
7+
import com.fasterxml.jackson.core.*;
88
import com.fasterxml.jackson.core.filter.TokenFilter.Inclusion;
99
import com.fasterxml.jackson.core.util.JsonGeneratorDelegate;
1010

src/test/java/com/fasterxml/jackson/core/filter/GeneratorFiltering890Test.java

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
11
package com.fasterxml.jackson.core.filter;
22

3-
import com.fasterxml.jackson.core.JUnit5TestBase;
4-
import com.fasterxml.jackson.core.JsonGenerator;
5-
import com.fasterxml.jackson.core.JsonPointer;
6-
import com.fasterxml.jackson.core.filter.TokenFilter.Inclusion;
7-
import org.junit.jupiter.api.Test;
8-
93
import java.io.ByteArrayOutputStream;
104
import java.io.IOException;
115
import java.util.ArrayList;
@@ -15,6 +9,13 @@
159
import java.util.stream.Collectors;
1610
import java.util.stream.Stream;
1711

12+
import org.junit.jupiter.api.Test;
13+
14+
import com.fasterxml.jackson.core.JUnit5TestBase;
15+
import com.fasterxml.jackson.core.JsonGenerator;
16+
import com.fasterxml.jackson.core.JsonPointer;
17+
import com.fasterxml.jackson.core.filter.TokenFilter.Inclusion;
18+
1819
import static org.junit.jupiter.api.Assertions.assertEquals;
1920

2021
// for [core#890]

src/test/java/com/fasterxml/jackson/core/filter/JsonPointerGeneratorFilteringTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
import java.io.*;
44

5-
import com.fasterxml.jackson.core.*;
6-
75
import org.junit.jupiter.api.Test;
6+
7+
import com.fasterxml.jackson.core.*;
88
import com.fasterxml.jackson.core.filter.TokenFilter.Inclusion;
99

1010
import static org.junit.jupiter.api.Assertions.assertEquals;

src/test/java/com/fasterxml/jackson/core/filter/JsonPointerParserFilteringTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
import java.io.StringWriter;
44

5-
import com.fasterxml.jackson.core.*;
6-
75
import org.junit.jupiter.api.Test;
6+
7+
import com.fasterxml.jackson.core.*;
88
import com.fasterxml.jackson.core.filter.TokenFilter.Inclusion;
99

1010
import static org.junit.jupiter.api.Assertions.assertEquals;

src/test/java/com/fasterxml/jackson/core/format/DataFormatMatcherTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
import java.io.IOException;
44
import java.io.InputStream;
55

6-
import com.fasterxml.jackson.core.JsonFactory;
7-
86
import org.junit.jupiter.api.Test;
97

8+
import com.fasterxml.jackson.core.JsonFactory;
9+
1010
import static org.junit.jupiter.api.Assertions.*;
1111

1212
/**

src/test/java/com/fasterxml/jackson/core/format/TestJsonFormatDetection.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
import java.io.*;
44

5-
import com.fasterxml.jackson.core.*;
6-
75
import org.junit.jupiter.api.Test;
86

7+
import com.fasterxml.jackson.core.*;
8+
99
import static org.junit.jupiter.api.Assertions.*;
1010

1111
class TestJsonFormatDetection extends com.fasterxml.jackson.core.JUnit5TestBase

src/test/java/com/fasterxml/jackson/core/fuzz/Fuzz32208UTF32ParseTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
import java.io.CharConversionException;
55
import java.io.InputStream;
66

7-
import com.fasterxml.jackson.core.*;
8-
97
import org.junit.jupiter.api.Test;
8+
9+
import com.fasterxml.jackson.core.*;
1010
import com.fasterxml.jackson.core.io.UTF32Reader;
1111
import com.fasterxml.jackson.core.testsupport.ThrottledInputStream;
1212

src/test/java/com/fasterxml/jackson/core/fuzz/Fuzz52688ParseTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
import java.io.*;
44
import java.math.BigInteger;
55

6-
import com.fasterxml.jackson.core.*;
7-
86
import org.junit.jupiter.api.Test;
7+
8+
import com.fasterxml.jackson.core.*;
99
import com.fasterxml.jackson.core.exc.StreamReadException;
1010
import com.fasterxml.jackson.core.testsupport.ThrottledInputStream;
1111

0 commit comments

Comments
 (0)