Skip to content

Commit 5ad4e50

Browse files
cowtowncodercowtowncoder
committed
Merge branch '2.19'
2 parents 5e9bd2c + 40c7633 commit 5ad4e50

File tree

87 files changed

+412
-290
lines changed

Some content is hidden

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

87 files changed

+412
-290
lines changed

‎avro/src/main/java/tools/jackson/dataformat/avro/AvroAnnotationIntrospector.java‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
package tools.jackson.dataformat.avro;
22

3-
import java.util.ArrayList;
4-
import java.util.Collections;
5-
import java.util.List;
3+
import java.util.*;
64

75
import org.apache.avro.reflect.*;
86

@@ -13,9 +11,7 @@
1311
import tools.jackson.databind.AnnotationIntrospector;
1412
import tools.jackson.databind.PropertyName;
1513
import tools.jackson.databind.cfg.MapperConfig;
16-
import tools.jackson.databind.introspect.Annotated;
17-
import tools.jackson.databind.introspect.AnnotatedConstructor;
18-
import tools.jackson.databind.introspect.AnnotatedMember;
14+
import tools.jackson.databind.introspect.*;
1915
import tools.jackson.databind.jsontype.NamedType;
2016
import tools.jackson.databind.ser.std.ToStringSerializer;
2117
import tools.jackson.databind.util.ClassUtil;

‎avro/src/main/java/tools/jackson/dataformat/avro/AvroModule.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@
88
import tools.jackson.core.JsonGenerator;
99
import tools.jackson.core.Version;
1010

11-
import tools.jackson.databind.AnnotationIntrospector;
12-
import tools.jackson.databind.JacksonModule;
13-
import tools.jackson.databind.SerializationContext;
11+
import tools.jackson.databind.*;
1412
import tools.jackson.databind.module.SimpleDeserializers;
1513
import tools.jackson.databind.module.SimpleSerializers;
1614
import tools.jackson.databind.ser.std.StdSerializer;

‎avro/src/main/java/tools/jackson/dataformat/avro/AvroSerializerModifier.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package tools.jackson.dataformat.avro;
22

3-
import java.util.*;
3+
import java.util.Iterator;
4+
import java.util.List;
45

56
import org.apache.avro.specific.SpecificRecordBase;
67

‎avro/src/main/java/tools/jackson/dataformat/avro/annotation/AvroDecimal.java‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
package tools.jackson.dataformat.avro.annotation;
22

3-
import java.lang.annotation.ElementType;
4-
import java.lang.annotation.Retention;
5-
import java.lang.annotation.RetentionPolicy;
6-
import java.lang.annotation.Target;
3+
import java.lang.annotation.*;
74

85
/**
96
* When generate logical types is enabled, annotation instructs the

‎avro/src/main/java/tools/jackson/dataformat/avro/annotation/AvroNamespace.java‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
package tools.jackson.dataformat.avro.annotation;
22

3-
import java.lang.annotation.ElementType;
4-
import java.lang.annotation.Retention;
5-
import java.lang.annotation.RetentionPolicy;
6-
import java.lang.annotation.Target;
3+
import java.lang.annotation.*;
74

85
/**
96
* Annotation allows to override default Avro type namespace value.

‎avro/src/main/java/tools/jackson/dataformat/avro/apacheimpl/ApacheAvroParserImpl.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
package tools.jackson.dataformat.avro.apacheimpl;
22

3-
import java.io.IOException;
4-
import java.io.InputStream;
5-
import java.io.Writer;
3+
import java.io.*;
64

75
import org.apache.avro.io.BinaryDecoder;
86
import org.apache.avro.io.DecoderFactory;

‎avro/src/main/java/tools/jackson/dataformat/avro/apacheimpl/ApacheCodecRecycler.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
import java.util.Objects;
44
import java.util.concurrent.atomic.AtomicReference;
55

6-
import org.apache.avro.io.*;
6+
import org.apache.avro.io.BinaryDecoder;
7+
import org.apache.avro.io.BinaryEncoder;
78

89
import tools.jackson.core.util.RecyclerPool;
910
import tools.jackson.core.util.RecyclerPool.WithPool;

‎avro/src/main/java/tools/jackson/dataformat/avro/deser/AvroParserImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package tools.jackson.dataformat.avro.deser;
22

3-
import java.io.*;
3+
import java.io.IOException;
44
import java.math.BigDecimal;
55
import java.math.BigInteger;
66

‎avro/src/main/java/tools/jackson/dataformat/avro/deser/AvroUntypedDeserializer.java‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
11
package tools.jackson.dataformat.avro.deser;
22

3-
import java.util.LinkedHashMap;
4-
import java.util.List;
5-
import java.util.Map;
3+
import java.util.*;
64

7-
import tools.jackson.core.JacksonException;
8-
import tools.jackson.core.JsonParser;
9-
import tools.jackson.core.JsonToken;
5+
import tools.jackson.core.*;
106

117
import tools.jackson.databind.DeserializationContext;
128
import tools.jackson.databind.JavaType;

‎avro/src/main/java/tools/jackson/dataformat/avro/deser/JacksonAvroParserImpl.java‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
package tools.jackson.dataformat.avro.deser;
22

3-
import java.io.IOException;
4-
import java.io.InputStream;
5-
import java.io.OutputStream;
6-
import java.io.Writer;
3+
import java.io.*;
74

85
import tools.jackson.core.*;
96
import tools.jackson.core.io.IOContext;

0 commit comments

Comments
 (0)