Skip to content

Commit 896c1cf

Browse files
authored
refactor: order imports (2.19) (#4734)
1 parent d5caa2e commit 896c1cf

File tree

548 files changed

+605
-490
lines changed

Some content is hidden

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

548 files changed

+605
-490
lines changed

src/main/java/com/fasterxml/jackson/databind/AnnotationIntrospector.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
import java.util.*;
55

66
import com.fasterxml.jackson.annotation.*;
7+
78
import com.fasterxml.jackson.core.Version;
89
import com.fasterxml.jackson.core.Versioned;
9-
1010
import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
1111
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
1212
import com.fasterxml.jackson.databind.cfg.MapperConfig;

src/main/java/com/fasterxml/jackson/databind/DatabindContext.java

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import java.util.TimeZone;
66

77
import com.fasterxml.jackson.annotation.*;
8+
89
import com.fasterxml.jackson.databind.cfg.DatatypeFeature;
910
import com.fasterxml.jackson.databind.cfg.DatatypeFeatures;
1011
import com.fasterxml.jackson.databind.cfg.HandlerInstantiator;

src/main/java/com/fasterxml/jackson/databind/DeserializationContext.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@
2121
import com.fasterxml.jackson.databind.deser.impl.ObjectIdReader;
2222
import com.fasterxml.jackson.databind.deser.impl.ReadableObjectId;
2323
import com.fasterxml.jackson.databind.deser.impl.TypeWrappedDeserializer;
24-
import com.fasterxml.jackson.databind.exc.MismatchedInputException;
2524
import com.fasterxml.jackson.databind.exc.InvalidDefinitionException;
2625
import com.fasterxml.jackson.databind.exc.InvalidFormatException;
2726
import com.fasterxml.jackson.databind.exc.InvalidTypeIdException;
27+
import com.fasterxml.jackson.databind.exc.MismatchedInputException;
2828
import com.fasterxml.jackson.databind.exc.UnrecognizedPropertyException;
2929
import com.fasterxml.jackson.databind.exc.ValueInstantiationException;
3030
import com.fasterxml.jackson.databind.introspect.Annotated;

src/main/java/com/fasterxml/jackson/databind/EnumNamingStrategies.java

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

3-
import com.fasterxml.jackson.databind.util.NamingStrategyImpls;
4-
53
import java.util.Locale;
64

5+
import com.fasterxml.jackson.databind.util.NamingStrategyImpls;
6+
77
/**
88
* A container class for implementations of the {@link EnumNamingStrategy} interface.
99
*

src/main/java/com/fasterxml/jackson/databind/JsonDeserializer.java

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import java.util.Collection;
55

66
import com.fasterxml.jackson.core.*;
7-
87
import com.fasterxml.jackson.databind.deser.*;
98
import com.fasterxml.jackson.databind.deser.impl.ObjectIdReader;
109
import com.fasterxml.jackson.databind.jsontype.TypeDeserializer;

src/main/java/com/fasterxml/jackson/databind/JsonMappingException.java

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import com.fasterxml.jackson.annotation.JsonIgnore;
99

1010
import com.fasterxml.jackson.core.*;
11-
1211
import com.fasterxml.jackson.databind.util.ClassUtil;
1312

1413
/**

src/main/java/com/fasterxml/jackson/databind/JsonNode.java

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import java.util.*;
77

88
import com.fasterxml.jackson.core.*;
9-
109
import com.fasterxml.jackson.databind.node.ArrayNode;
1110
import com.fasterxml.jackson.databind.node.JsonNodeType;
1211
import com.fasterxml.jackson.databind.node.MissingNode;

src/main/java/com/fasterxml/jackson/databind/JsonSerializer.java

-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import java.util.Set;
66

77
import com.fasterxml.jackson.core.*;
8-
98
import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatVisitable;
109
import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatVisitorWrapper;
1110
import com.fasterxml.jackson.databind.jsontype.TypeSerializer;

src/main/java/com/fasterxml/jackson/databind/Module.java

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

33
import java.util.Collection;
4+
import java.util.Collections;
45

56
import com.fasterxml.jackson.core.*;
67
import com.fasterxml.jackson.databind.cfg.MutableConfigOverride;
@@ -15,7 +16,6 @@
1516
import com.fasterxml.jackson.databind.ser.Serializers;
1617
import com.fasterxml.jackson.databind.type.TypeFactory;
1718
import com.fasterxml.jackson.databind.type.TypeModifier;
18-
import java.util.Collections;
1919

2020
/**
2121
* Simple interface for extensions that can be registered with {@link ObjectMapper}

src/main/java/com/fasterxml/jackson/databind/ObjectMapper.java

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import java.util.function.Consumer;
1313

1414
import com.fasterxml.jackson.annotation.*;
15+
1516
import com.fasterxml.jackson.core.*;
1617
import com.fasterxml.jackson.core.exc.StreamReadException;
1718
import com.fasterxml.jackson.core.exc.StreamWriteException;

src/main/java/com/fasterxml/jackson/databind/ObjectReader.java

-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
import com.fasterxml.jackson.core.filter.TokenFilter.Inclusion;
1414
import com.fasterxml.jackson.core.type.ResolvedType;
1515
import com.fasterxml.jackson.core.type.TypeReference;
16-
1716
import com.fasterxml.jackson.databind.cfg.ContextAttributes;
1817
import com.fasterxml.jackson.databind.cfg.DatatypeFeature;
1918
import com.fasterxml.jackson.databind.deser.DataFormatReaders;

src/main/java/com/fasterxml/jackson/databind/PropertyMetadata.java

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

33
import com.fasterxml.jackson.annotation.Nulls;
4+
45
import com.fasterxml.jackson.databind.introspect.AnnotatedMember;
56

67
/**

src/main/java/com/fasterxml/jackson/databind/PropertyName.java

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

3+
import java.util.Objects;
4+
35
import com.fasterxml.jackson.core.SerializableString;
46
import com.fasterxml.jackson.core.io.SerializedString;
57
import com.fasterxml.jackson.core.util.InternCache;
68
import com.fasterxml.jackson.databind.cfg.MapperConfig;
79
import com.fasterxml.jackson.databind.util.ClassUtil;
810

9-
import java.util.Objects;
10-
1111
/**
1212
* Simple value class used for containing names of properties as defined
1313
* by annotations (and possibly other configuration sources).

src/main/java/com/fasterxml/jackson/databind/PropertyNamingStrategy.java

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

3+
import java.util.logging.Logger;
4+
35
import com.fasterxml.jackson.databind.cfg.MapperConfig;
46
import com.fasterxml.jackson.databind.introspect.AnnotatedField;
57
import com.fasterxml.jackson.databind.introspect.AnnotatedMethod;
68
import com.fasterxml.jackson.databind.introspect.AnnotatedParameter;
79

8-
import java.util.logging.Logger;
9-
1010
/**
1111
* Class that defines how names of JSON properties ("external names")
1212
* are derived from names of POJO methods and fields ("internal names"),

src/main/java/com/fasterxml/jackson/databind/SerializationConfig.java

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import com.fasterxml.jackson.core.json.JsonWriteFeature;
99
import com.fasterxml.jackson.core.util.DefaultPrettyPrinter;
1010
import com.fasterxml.jackson.core.util.Instantiatable;
11-
1211
import com.fasterxml.jackson.databind.cfg.*;
1312
import com.fasterxml.jackson.databind.introspect.SimpleMixInResolver;
1413
import com.fasterxml.jackson.databind.jsontype.SubtypeResolver;

src/main/java/com/fasterxml/jackson/databind/SerializerProvider.java

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import com.fasterxml.jackson.annotation.JsonFormat;
1010
import com.fasterxml.jackson.annotation.JsonInclude;
1111
import com.fasterxml.jackson.annotation.ObjectIdGenerator;
12+
1213
import com.fasterxml.jackson.core.JsonGenerator;
1314
import com.fasterxml.jackson.core.ObjectCodec;
1415
import com.fasterxml.jackson.databind.cfg.ContextAttributes;

src/main/java/com/fasterxml/jackson/databind/annotation/EnumNaming.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package com.fasterxml.jackson.databind.annotation;
22

3-
import com.fasterxml.jackson.databind.EnumNamingStrategy;
4-
53
import java.lang.annotation.ElementType;
64
import java.lang.annotation.Retention;
75
import java.lang.annotation.RetentionPolicy;
86
import java.lang.annotation.Target;
97

8+
import com.fasterxml.jackson.databind.EnumNamingStrategy;
9+
1010
/**
1111
* Annotation that can be used to indicate a {@link EnumNamingStrategy}
1212
* to use for annotated class.

src/main/java/com/fasterxml/jackson/databind/annotation/JsonAppend.java

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import java.lang.annotation.Target;
77

88
import com.fasterxml.jackson.annotation.JsonInclude;
9+
910
import com.fasterxml.jackson.databind.ser.VirtualBeanPropertyWriter;
1011

1112
/**

src/main/java/com/fasterxml/jackson/databind/annotation/JsonTypeIdResolver.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
import java.lang.annotation.RetentionPolicy;
66
import java.lang.annotation.Target;
77

8-
98
import com.fasterxml.jackson.annotation.JacksonAnnotation;
9+
1010
import com.fasterxml.jackson.databind.jsontype.TypeIdResolver;
1111

1212
/**

src/main/java/com/fasterxml/jackson/databind/cfg/BaseSettings.java

-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import java.util.TimeZone;
66

77
import com.fasterxml.jackson.core.Base64Variant;
8-
98
import com.fasterxml.jackson.databind.*;
109
import com.fasterxml.jackson.databind.introspect.AccessorNamingStrategy;
1110
import com.fasterxml.jackson.databind.introspect.AnnotationIntrospectorPair;

src/main/java/com/fasterxml/jackson/databind/cfg/ConfigOverrides.java

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import com.fasterxml.jackson.annotation.JsonFormat;
66
import com.fasterxml.jackson.annotation.JsonInclude;
77
import com.fasterxml.jackson.annotation.JsonSetter;
8+
89
import com.fasterxml.jackson.databind.introspect.VisibilityChecker;
910

1011
/**

src/main/java/com/fasterxml/jackson/databind/cfg/HandlerInstantiator.java

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

33
import com.fasterxml.jackson.annotation.ObjectIdGenerator;
44
import com.fasterxml.jackson.annotation.ObjectIdResolver;
5+
56
import com.fasterxml.jackson.databind.*;
67
import com.fasterxml.jackson.databind.deser.ValueInstantiator;
78
import com.fasterxml.jackson.databind.introspect.Annotated;

src/main/java/com/fasterxml/jackson/databind/cfg/MapperBuilder.java

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import com.fasterxml.jackson.annotation.JsonSetter;
1212
import com.fasterxml.jackson.annotation.JsonTypeInfo;
1313
import com.fasterxml.jackson.annotation.PropertyAccessor;
14+
1415
import com.fasterxml.jackson.core.*;
1516
import com.fasterxml.jackson.databind.*;
1617
import com.fasterxml.jackson.databind.ObjectMapper.DefaultTyping;

src/main/java/com/fasterxml/jackson/databind/cfg/MapperConfig.java

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import com.fasterxml.jackson.core.SerializableString;
1111
import com.fasterxml.jackson.core.io.SerializedString;
1212
import com.fasterxml.jackson.core.type.TypeReference;
13-
1413
import com.fasterxml.jackson.databind.*;
1514
import com.fasterxml.jackson.databind.introspect.AccessorNamingStrategy;
1615
import com.fasterxml.jackson.databind.introspect.Annotated;

src/main/java/com/fasterxml/jackson/databind/cfg/MapperConfigBase.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55

66
import com.fasterxml.jackson.annotation.*;
77
import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
8-
import com.fasterxml.jackson.core.Base64Variant;
98

9+
import com.fasterxml.jackson.core.Base64Variant;
1010
import com.fasterxml.jackson.databind.*;
11-
import com.fasterxml.jackson.databind.introspect.ClassIntrospector;
12-
import com.fasterxml.jackson.databind.introspect.ClassIntrospector.MixInResolver;
1311
import com.fasterxml.jackson.databind.introspect.AccessorNamingStrategy;
1412
import com.fasterxml.jackson.databind.introspect.AnnotatedClass;
13+
import com.fasterxml.jackson.databind.introspect.ClassIntrospector;
14+
import com.fasterxml.jackson.databind.introspect.ClassIntrospector.MixInResolver;
1515
import com.fasterxml.jackson.databind.introspect.SimpleMixInResolver;
1616
import com.fasterxml.jackson.databind.introspect.VisibilityChecker;
1717
import com.fasterxml.jackson.databind.jsontype.SubtypeResolver;

src/main/java/com/fasterxml/jackson/databind/cfg/MutableCoercionConfig.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package com.fasterxml.jackson.databind.cfg;
22

3+
import java.util.function.Consumer;
4+
35
import com.fasterxml.jackson.databind.json.JsonMapper;
46
import com.fasterxml.jackson.databind.type.LogicalType;
57

6-
import java.util.function.Consumer;
7-
88
/**
99
* Mutable version of {@link CoercionConfig} (or rather, extended API)
1010
* exposed during configuration phase of {@link com.fasterxml.jackson.databind.ObjectMapper}

src/main/java/com/fasterxml/jackson/databind/deser/AbstractDeserializer.java

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import com.fasterxml.jackson.annotation.ObjectIdResolver;
99

1010
import com.fasterxml.jackson.core.*;
11-
1211
import com.fasterxml.jackson.databind.*;
1312
import com.fasterxml.jackson.databind.deser.impl.ObjectIdReader;
1413
import com.fasterxml.jackson.databind.deser.impl.PropertyBasedObjectIdGenerator;

src/main/java/com/fasterxml/jackson/databind/deser/BasicDeserializerFactory.java

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import com.fasterxml.jackson.annotation.*;
1111

1212
import com.fasterxml.jackson.core.JsonParser;
13-
1413
import com.fasterxml.jackson.databind.*;
1514
import com.fasterxml.jackson.databind.cfg.*;
1615
import com.fasterxml.jackson.databind.deser.impl.CreatorCandidate;

src/main/java/com/fasterxml/jackson/databind/deser/BeanDeserializerBase.java

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010

1111
import com.fasterxml.jackson.core.*;
1212
import com.fasterxml.jackson.core.JsonParser.NumberType;
13-
1413
import com.fasterxml.jackson.databind.*;
1514
import com.fasterxml.jackson.databind.cfg.ConfigOverride;
1615
import com.fasterxml.jackson.databind.deser.impl.*;

src/main/java/com/fasterxml/jackson/databind/deser/BeanDeserializerBuilder.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@
33
import java.util.*;
44

55
import com.fasterxml.jackson.annotation.JsonFormat;
6+
67
import com.fasterxml.jackson.databind.*;
78
import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
89
import com.fasterxml.jackson.databind.deser.impl.BeanPropertyMap;
9-
import com.fasterxml.jackson.databind.deser.impl.ObjectIdValueProperty;
1010
import com.fasterxml.jackson.databind.deser.impl.ObjectIdReader;
11+
import com.fasterxml.jackson.databind.deser.impl.ObjectIdValueProperty;
1112
import com.fasterxml.jackson.databind.deser.impl.ValueInjector;
1213
import com.fasterxml.jackson.databind.introspect.*;
1314
import com.fasterxml.jackson.databind.util.Annotations;

src/main/java/com/fasterxml/jackson/databind/deser/BeanDeserializerFactory.java

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import java.util.*;
44

55
import com.fasterxml.jackson.annotation.*;
6+
67
import com.fasterxml.jackson.databind.*;
78
import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
89
import com.fasterxml.jackson.databind.cfg.DeserializerFactoryConfig;

src/main/java/com/fasterxml/jackson/databind/deser/CreatorProperty.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
import java.lang.annotation.Annotation;
55

66
import com.fasterxml.jackson.annotation.JacksonInject;
7-
import com.fasterxml.jackson.core.JsonParser;
87

8+
import com.fasterxml.jackson.core.JsonParser;
99
import com.fasterxml.jackson.databind.*;
1010
import com.fasterxml.jackson.databind.exc.InvalidDefinitionException;
1111
import com.fasterxml.jackson.databind.introspect.AnnotatedMember;

src/main/java/com/fasterxml/jackson/databind/deser/DataFormatReaders.java

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import com.fasterxml.jackson.core.*;
99
import com.fasterxml.jackson.core.format.*;
1010
import com.fasterxml.jackson.core.io.MergedStream;
11-
1211
import com.fasterxml.jackson.databind.*;
1312

1413
/**

src/main/java/com/fasterxml/jackson/databind/deser/DefaultDeserializationContext.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
import java.util.Map.Entry;
66

77
import com.fasterxml.jackson.annotation.ObjectIdGenerator;
8-
import com.fasterxml.jackson.annotation.ObjectIdResolver;
98
import com.fasterxml.jackson.annotation.ObjectIdGenerator.IdKey;
9+
import com.fasterxml.jackson.annotation.ObjectIdResolver;
1010

1111
import com.fasterxml.jackson.core.JsonParser;
1212
import com.fasterxml.jackson.core.JsonToken;

src/main/java/com/fasterxml/jackson/databind/deser/DeserializerCache.java

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import java.util.concurrent.locks.ReentrantLock;
66

77
import com.fasterxml.jackson.annotation.JsonFormat;
8+
89
import com.fasterxml.jackson.databind.*;
910
import com.fasterxml.jackson.databind.deser.std.StdDelegatingDeserializer;
1011
import com.fasterxml.jackson.databind.introspect.Annotated;

src/main/java/com/fasterxml/jackson/databind/deser/SettableBeanProperty.java

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import java.lang.annotation.Annotation;
55

66
import com.fasterxml.jackson.core.*;
7-
87
import com.fasterxml.jackson.databind.*;
98
import com.fasterxml.jackson.databind.deser.impl.FailingDeserializer;
109
import com.fasterxml.jackson.databind.deser.impl.NullsConstantProvider;

src/main/java/com/fasterxml/jackson/databind/deser/UnresolvedForwardReference.java

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

77
import com.fasterxml.jackson.core.JsonLocation;
88
import com.fasterxml.jackson.core.JsonParser;
9-
109
import com.fasterxml.jackson.databind.JsonMappingException;
1110
import com.fasterxml.jackson.databind.deser.impl.ReadableObjectId;
1211

src/main/java/com/fasterxml/jackson/databind/deser/ValueInstantiator.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
package com.fasterxml.jackson.databind.deser;
22

33
import java.io.IOException;
4+
import java.math.BigDecimal;
5+
import java.math.BigInteger;
46

57
import com.fasterxml.jackson.databind.*;
68
import com.fasterxml.jackson.databind.cfg.CoercionAction;
79
import com.fasterxml.jackson.databind.cfg.CoercionInputShape;
810
import com.fasterxml.jackson.databind.deser.impl.PropertyValueBuffer;
911
import com.fasterxml.jackson.databind.introspect.AnnotatedWithParams;
1012
import com.fasterxml.jackson.databind.type.LogicalType;
11-
import java.math.BigDecimal;
12-
import java.math.BigInteger;
1313

1414
/**
1515
* Class that defines simple API implemented by objects that create value

src/main/java/com/fasterxml/jackson/databind/deser/impl/BeanPropertyMap.java

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

77
import com.fasterxml.jackson.core.JacksonException;
88
import com.fasterxml.jackson.core.JsonParser;
9-
109
import com.fasterxml.jackson.databind.DeserializationContext;
1110
import com.fasterxml.jackson.databind.DeserializationFeature;
1211
import com.fasterxml.jackson.databind.JsonDeserializer;

src/main/java/com/fasterxml/jackson/databind/deser/impl/CreatorCandidate.java

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.fasterxml.jackson.databind.deser.impl;
22

33
import com.fasterxml.jackson.annotation.JacksonInject;
4+
45
import com.fasterxml.jackson.databind.AnnotationIntrospector;
56
import com.fasterxml.jackson.databind.PropertyName;
67
import com.fasterxml.jackson.databind.introspect.AnnotatedParameter;

0 commit comments

Comments
 (0)