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

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.

avro/src/main/java/com/fasterxml/jackson/dataformat/avro/apacheimpl/ApacheAvroParserImpl.java

@@ -1,13 +1,12 @@
 package com.fasterxml.jackson.dataformat.avro.apacheimpl;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.Writer;
+import java.io.*;
 
 import org.apache.avro.io.BinaryDecoder;
 import org.apache.avro.io.DecoderFactory;
 
-import com.fasterxml.jackson.core.*;
+import com.fasterxml.jackson.core.JsonToken;
+import com.fasterxml.jackson.core.ObjectCodec;
 import com.fasterxml.jackson.core.io.IOContext;
 import com.fasterxml.jackson.dataformat.avro.deser.AvroParserImpl;
 import com.fasterxml.jackson.dataformat.avro.deser.AvroReadContext;

avro/src/main/java/com/fasterxml/jackson/dataformat/avro/apacheimpl/ApacheCodecRecycler.java

@@ -3,11 +3,12 @@
 import java.util.Objects;
 import java.util.concurrent.atomic.AtomicReference;
 
+import org.apache.avro.io.BinaryDecoder;
+import org.apache.avro.io.BinaryEncoder;
+
 import com.fasterxml.jackson.core.util.RecyclerPool;
 import com.fasterxml.jackson.core.util.RecyclerPool.WithPool;
 
-import org.apache.avro.io.*;
-
 /**
  * Simple helper class that contains extracted functionality for
  * simple encoder/decoder recycling.

avro/src/main/java/com/fasterxml/jackson/dataformat/avro/deser/AvroParserImpl.java

@@ -1,12 +1,11 @@
 package com.fasterxml.jackson.dataformat.avro.deser;
 
-import java.io.*;
+import java.io.IOException;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 
 import com.fasterxml.jackson.core.*;
 import com.fasterxml.jackson.core.io.IOContext;
-
 import com.fasterxml.jackson.dataformat.avro.AvroParser;
 import com.fasterxml.jackson.dataformat.avro.AvroSchema;
 

avro/src/main/java/com/fasterxml/jackson/dataformat/avro/deser/AvroUntypedDeserializer.java

@@ -5,10 +5,7 @@
 
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonToken;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.JsonMappingException;
-import com.fasterxml.jackson.databind.KeyDeserializer;
+import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.deser.ResolvableDeserializer;
 import com.fasterxml.jackson.databind.deser.std.UntypedObjectDeserializer;
 import com.fasterxml.jackson.databind.jsontype.TypeDeserializer;

avro/src/main/java/com/fasterxml/jackson/dataformat/avro/deser/JacksonAvroParserImpl.java

@@ -1,9 +1,6 @@
 package com.fasterxml.jackson.dataformat.avro.deser;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.Writer;
+import java.io.*;
 
 import com.fasterxml.jackson.core.*;
 import com.fasterxml.jackson.core.io.IOContext;

avro/src/main/java/com/fasterxml/jackson/dataformat/avro/jsr310/AvroJavaTimeModule.java

@@ -1,22 +1,11 @@
 package com.fasterxml.jackson.dataformat.avro.jsr310;
 
+import java.time.*;
+
 import com.fasterxml.jackson.databind.module.SimpleModule;
 import com.fasterxml.jackson.dataformat.avro.PackageVersion;
-import com.fasterxml.jackson.dataformat.avro.jsr310.deser.AvroInstantDeserializer;
-import com.fasterxml.jackson.dataformat.avro.jsr310.deser.AvroLocalDateDeserializer;
-import com.fasterxml.jackson.dataformat.avro.jsr310.deser.AvroLocalDateTimeDeserializer;
-import com.fasterxml.jackson.dataformat.avro.jsr310.deser.AvroLocalTimeDeserializer;
-import com.fasterxml.jackson.dataformat.avro.jsr310.ser.AvroInstantSerializer;
-import com.fasterxml.jackson.dataformat.avro.jsr310.ser.AvroLocalDateSerializer;
-import com.fasterxml.jackson.dataformat.avro.jsr310.ser.AvroLocalDateTimeSerializer;
-import com.fasterxml.jackson.dataformat.avro.jsr310.ser.AvroLocalTimeSerializer;
-
-import java.time.Instant;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.time.OffsetDateTime;
-import java.time.ZonedDateTime;
+import com.fasterxml.jackson.dataformat.avro.jsr310.deser.*;
+import com.fasterxml.jackson.dataformat.avro.jsr310.ser.*;
 
 /**
  * A module that installs a collection of serializers and deserializers for java.time classes.

avro/src/main/java/com/fasterxml/jackson/dataformat/avro/jsr310/deser/AvroInstantDeserializer.java

@@ -1,9 +1,6 @@
 package com.fasterxml.jackson.dataformat.avro.jsr310.deser;
 
-import java.time.Instant;
-import java.time.OffsetDateTime;
-import java.time.ZoneId;
-import java.time.ZonedDateTime;
+import java.time.*;
 import java.time.temporal.Temporal;
 import java.util.function.BiFunction;
 

avro/src/main/java/com/fasterxml/jackson/dataformat/avro/jsr310/deser/AvroJavaTimeDeserializerBase.java

@@ -1,13 +1,13 @@
 package com.fasterxml.jackson.dataformat.avro.jsr310.deser;
 
+import java.io.IOException;
+import java.time.ZoneId;
+
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.deser.std.StdScalarDeserializer;
 import com.fasterxml.jackson.databind.type.LogicalType;
 
-import java.io.IOException;
-import java.time.ZoneId;
-
 import static com.fasterxml.jackson.core.JsonToken.VALUE_NUMBER_INT;
 
 public abstract class AvroJavaTimeDeserializerBase<T> extends StdScalarDeserializer<T>

avro/src/main/java/com/fasterxml/jackson/dataformat/avro/jsr310/deser/AvroLocalDateTimeDeserializer.java

@@ -1,9 +1,6 @@
 package com.fasterxml.jackson.dataformat.avro.jsr310.deser;
 
-import java.time.Instant;
-import java.time.LocalDateTime;
-import java.time.ZoneId;
-import java.time.ZoneOffset;
+import java.time.*;
 
 /**
  * Deserializer for {@link LocalDateTime} from an integer value.

avro/src/main/java/com/fasterxml/jackson/dataformat/avro/jsr310/ser/AvroInstantSerializer.java

@@ -1,21 +1,17 @@
 package com.fasterxml.jackson.dataformat.avro.jsr310.ser;
 
+import java.io.IOException;
+import java.time.*;
+import java.time.temporal.Temporal;
+import java.util.function.Function;
+
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.JsonMappingException;
-import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatVisitorWrapper;
 import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonIntegerFormatVisitor;
 import com.fasterxml.jackson.databind.ser.std.StdScalarSerializer;
 
-import java.io.IOException;
-import java.time.Instant;
-import java.time.OffsetDateTime;
-import java.time.ZonedDateTime;
-import java.time.temporal.Temporal;
-import java.util.function.Function;
-
 /**
  * Serializer for variants of java.time classes (Instant, OffsetDateTime, ZonedDateTime) into long value.
  *

avro/src/main/java/com/fasterxml/jackson/dataformat/avro/jsr310/ser/AvroLocalDateSerializer.java

@@ -1,17 +1,15 @@
 package com.fasterxml.jackson.dataformat.avro.jsr310.ser;
 
+import java.io.IOException;
+import java.time.LocalDate;
+
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.JsonMappingException;
-import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatVisitorWrapper;
 import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonIntegerFormatVisitor;
 import com.fasterxml.jackson.databind.ser.std.StdScalarSerializer;
 
-import java.io.IOException;
-import java.time.LocalDate;
-
 /**
  * Serializer for {@link LocalDate} into int value.
  *

avro/src/main/java/com/fasterxml/jackson/dataformat/avro/jsr310/ser/AvroLocalDateTimeSerializer.java

@@ -1,19 +1,15 @@
 package com.fasterxml.jackson.dataformat.avro.jsr310.ser;
 
+import java.io.IOException;
+import java.time.*;
+
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.JsonMappingException;
-import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatVisitorWrapper;
 import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonIntegerFormatVisitor;
 import com.fasterxml.jackson.databind.ser.std.StdScalarSerializer;
 
-import java.io.IOException;
-import java.time.Instant;
-import java.time.LocalDateTime;
-import java.time.ZoneOffset;
-
 /**
  * Serializer for {@link LocalDateTime} into long value
  *

avro/src/main/java/com/fasterxml/jackson/dataformat/avro/jsr310/ser/AvroLocalTimeSerializer.java

@@ -1,17 +1,15 @@
 package com.fasterxml.jackson.dataformat.avro.jsr310.ser;
 
+import java.io.IOException;
+import java.time.LocalTime;
+
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.JsonMappingException;
-import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatVisitorWrapper;
 import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonIntegerFormatVisitor;
 import com.fasterxml.jackson.databind.ser.std.StdScalarSerializer;
 
-import java.io.IOException;
-import java.time.LocalTime;
-
 /**
  * Serializer for {@link LocalTime} into int value.
  *

avro/src/main/java/com/fasterxml/jackson/dataformat/avro/schema/ArrayVisitor.java

@@ -5,12 +5,8 @@
 import org.apache.avro.Schema;
 import org.apache.avro.Schema.Type;
 
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.JsonMappingException;
-import com.fasterxml.jackson.databind.SerializerProvider;
-import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonArrayFormatVisitor;
-import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatTypes;
-import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatVisitable;
+import com.fasterxml.jackson.databind.*;
+import com.fasterxml.jackson.databind.jsonFormatVisitors.*;
 
 import static com.fasterxml.jackson.dataformat.avro.schema.AvroSchemaHelper.AVRO_SCHEMA_PROP_CLASS;
 

avro/src/main/java/com/fasterxml/jackson/dataformat/avro/schema/AvroSchemaHelper.java

@@ -7,10 +7,8 @@
 import java.net.URL;
 import java.util.*;
 
-import org.apache.avro.JsonProperties;
-import org.apache.avro.Schema;
+import org.apache.avro.*;
 import org.apache.avro.Schema.Parser;
-import org.apache.avro.SchemaParseException;
 import org.apache.avro.reflect.AvroAlias;
 import org.apache.avro.reflect.Stringable;
 import org.apache.avro.specific.SpecificData;