Merge branch '2.19' into joohyukkim/2.19/547-migrate-smile-module

Author: cowtowncoder

avro/src/main/java/com/fasterxml/jackson/dataformat/avro/AvroAnnotationIntrospector.java

@@ -1,22 +1,15 @@
 package com.fasterxml.jackson.dataformat.avro;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
+import java.util.*;
 
 import org.apache.avro.reflect.*;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.core.Version;
-import com.fasterxml.jackson.databind.AnnotationIntrospector;
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.PropertyName;
+import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.cfg.MapperConfig;
-import com.fasterxml.jackson.databind.introspect.Annotated;
-import com.fasterxml.jackson.databind.introspect.AnnotatedClass;
-import com.fasterxml.jackson.databind.introspect.AnnotatedConstructor;
-import com.fasterxml.jackson.databind.introspect.AnnotatedMember;
+import com.fasterxml.jackson.databind.introspect.*;
 import com.fasterxml.jackson.databind.jsontype.NamedType;
 import com.fasterxml.jackson.databind.jsontype.TypeResolverBuilder;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;

avro/src/main/java/com/fasterxml/jackson/dataformat/avro/AvroFactory.java

@@ -10,7 +10,7 @@
 import com.fasterxml.jackson.core.util.RecyclerPool;
 import com.fasterxml.jackson.dataformat.avro.apacheimpl.ApacheCodecRecycler;
 import com.fasterxml.jackson.dataformat.avro.apacheimpl.AvroRecyclerPools;
-import com.fasterxml.jackson.dataformat.avro.deser.*;
+import com.fasterxml.jackson.dataformat.avro.deser.JacksonAvroParserImpl;
 
 /**
  * Default {@link JsonFactory} implementation for encoding/decoding Avro

avro/src/main/java/com/fasterxml/jackson/dataformat/avro/AvroFactoryBuilder.java

@@ -2,7 +2,6 @@
 
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.TSFBuilder;
-import com.fasterxml.jackson.dataformat.avro.AvroFactoryBuilder;
 
 /**
  * {@link com.fasterxml.jackson.core.TSFBuilder}

avro/src/main/java/com/fasterxml/jackson/dataformat/avro/AvroMapper.java

@@ -1,18 +1,13 @@
 package com.fasterxml.jackson.dataformat.avro;
 
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
+import java.io.*;
 
 import org.apache.avro.Schema;
 
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.Version;
-
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.Module;
-import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.cfg.MapperBuilder;
 import com.fasterxml.jackson.databind.exc.InvalidDefinitionException;
 import com.fasterxml.jackson.databind.util.ClassUtil;

avro/src/main/java/com/fasterxml/jackson/dataformat/avro/AvroModule.java

@@ -7,10 +7,8 @@
 
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.Version;
-
-import com.fasterxml.jackson.databind.AnnotationIntrospector;
 import com.fasterxml.jackson.databind.Module;
-import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.module.SimpleDeserializers;
 import com.fasterxml.jackson.databind.module.SimpleSerializers;
 import com.fasterxml.jackson.databind.ser.std.StdSerializer;

avro/src/main/java/com/fasterxml/jackson/dataformat/avro/AvroSerializerModifier.java

@@ -1,6 +1,7 @@
 package com.fasterxml.jackson.dataformat.avro;
 
-import java.util.*;
+import java.util.Iterator;
+import java.util.List;
 
 import org.apache.avro.specific.SpecificRecordBase;
 

avro/src/main/java/com/fasterxml/jackson/dataformat/avro/AvroTypeIdResolver.java

@@ -1,9 +1,7 @@
 package com.fasterxml.jackson.dataformat.avro;
 
 import java.io.IOException;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.*;
 
 import com.fasterxml.jackson.databind.DatabindContext;
 import com.fasterxml.jackson.databind.JavaType;

avro/src/main/java/com/fasterxml/jackson/dataformat/avro/AvroTypeResolverBuilder.java

@@ -3,15 +3,9 @@
 import java.util.Collection;
 
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import com.fasterxml.jackson.databind.DeserializationConfig;
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.SerializationConfig;
+import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.cfg.MapperConfig;
-import com.fasterxml.jackson.databind.jsontype.NamedType;
-import com.fasterxml.jackson.databind.jsontype.PolymorphicTypeValidator;
-import com.fasterxml.jackson.databind.jsontype.TypeDeserializer;
-import com.fasterxml.jackson.databind.jsontype.TypeIdResolver;
-import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
+import com.fasterxml.jackson.databind.jsontype.*;
 import com.fasterxml.jackson.databind.jsontype.impl.StdTypeResolverBuilder;
 
 /**

avro/src/main/java/com/fasterxml/jackson/dataformat/avro/annotation/AvroDecimal.java

@@ -1,9 +1,6 @@
 package com.fasterxml.jackson.dataformat.avro.annotation;
 
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
+import java.lang.annotation.*;
 
 /**
  * When generate logical types is enabled, annotation instructs the

avro/src/main/java/com/fasterxml/jackson/dataformat/avro/annotation/AvroNamespace.java

@@ -1,9 +1,6 @@
 package com.fasterxml.jackson.dataformat.avro.annotation;
 
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
+import java.lang.annotation.*;
 
 /**
  * Annotation allows to override default Avro type namespace value.