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

Author: cowtowncoder

ion/src/main/java/com/fasterxml/jackson/dataformat/ion/EnumAsIonSymbolSerializer.java

@@ -19,11 +19,7 @@
 
 import com.fasterxml.jackson.core.JsonGenerationException;
 import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.JsonMappingException;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.SerializationFeature;
-import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatVisitorWrapper;
 import com.fasterxml.jackson.databind.ser.std.StdScalarSerializer;
 

ion/src/main/java/com/fasterxml/jackson/dataformat/ion/IonFactory.java

@@ -14,32 +14,16 @@
 
 package com.fasterxml.jackson.dataformat.ion;
 
-import java.io.CharArrayReader;
-import java.io.Closeable;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.Reader;
-import java.io.Writer;
-
-import com.fasterxml.jackson.core.JsonEncoding;
-import com.fasterxml.jackson.core.JsonFactory;
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.ObjectCodec;
-import com.fasterxml.jackson.core.Version;
+import java.io.*;
+
+import com.amazon.ion.*;
+import com.amazon.ion.system.IonSystemBuilder;
+
+import com.fasterxml.jackson.core.*;
 import com.fasterxml.jackson.core.io.IOContext;
 import com.fasterxml.jackson.core.io.UTF8Writer;
 import com.fasterxml.jackson.core.util.TextBuffer;
 
-import com.amazon.ion.IonReader;
-import com.amazon.ion.IonSystem;
-import com.amazon.ion.IonValue;
-import com.amazon.ion.IonWriter;
-import com.amazon.ion.system.IonSystemBuilder;
-
 /**
  * Sub-class of {@link JsonFactory} that will work on Ion content, instead of JSON
  * content.

ion/src/main/java/com/fasterxml/jackson/dataformat/ion/IonFactoryBuilder.java

@@ -1,10 +1,10 @@
 package com.fasterxml.jackson.dataformat.ion;
 
-import com.fasterxml.jackson.core.TSFBuilder;
-
 import com.amazon.ion.IonSystem;
 import com.amazon.ion.system.IonSystemBuilder;
 
+import com.fasterxml.jackson.core.TSFBuilder;
+
 /**
  * {@link com.fasterxml.jackson.core.TSFBuilder}
  * implementation for constructing {@link IonFactory} instances.

ion/src/main/java/com/fasterxml/jackson/dataformat/ion/IonGenerator.java

@@ -14,32 +14,21 @@
 
 package com.fasterxml.jackson.dataformat.ion;
 
-import java.io.Closeable;
-import java.io.Flushable;
-import java.io.IOException;
+import java.io.*;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.nio.charset.StandardCharsets;
 import java.util.Calendar;
 
-import com.fasterxml.jackson.core.Base64Variant;
-import com.fasterxml.jackson.core.FormatFeature;
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.core.ObjectCodec;
-import com.fasterxml.jackson.core.StreamWriteCapability;
-import com.fasterxml.jackson.core.StreamWriteConstraints;
-import com.fasterxml.jackson.core.Version;
+import com.amazon.ion.*;
+
+import com.fasterxml.jackson.core.*;
 import com.fasterxml.jackson.core.base.GeneratorBase;
 import com.fasterxml.jackson.core.io.IOContext;
 import com.fasterxml.jackson.core.json.JsonWriteContext;
 import com.fasterxml.jackson.core.util.JacksonFeatureSet;
 import com.fasterxml.jackson.dataformat.ion.polymorphism.IonAnnotationTypeSerializer;
 
-import com.amazon.ion.IonType;
-import com.amazon.ion.IonValue;
-import com.amazon.ion.IonWriter;
-import com.amazon.ion.Timestamp;
-
 /**
  * Implementation of {@link JsonGenerator} that will use an underlying
  * {@link IonWriter} for actual writing of content.

ion/src/main/java/com/fasterxml/jackson/dataformat/ion/IonObjectMapper.java

@@ -17,20 +17,16 @@
 import java.io.IOException;
 import java.util.Date;
 
+import com.amazon.ion.*;
+import com.amazon.ion.system.IonSystemBuilder;
+
 import com.fasterxml.jackson.core.Version;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.cfg.MapperBuilder;
 import com.fasterxml.jackson.databind.module.SimpleModule;
 
-import com.amazon.ion.IonDatagram;
-import com.amazon.ion.IonReader;
-import com.amazon.ion.IonSystem;
-import com.amazon.ion.IonValue;
-import com.amazon.ion.IonWriter;
-import com.amazon.ion.system.IonSystemBuilder;
-
 /**
  * Specialization of {@link ObjectMapper} that will set underlying
  * {@link com.fasterxml.jackson.core.JsonFactory}

ion/src/main/java/com/fasterxml/jackson/dataformat/ion/IonParser.java

@@ -19,13 +19,14 @@
 import java.math.BigDecimal;
 import java.math.BigInteger;
 
+import com.amazon.ion.*;
+import com.amazon.ion.system.IonSystemBuilder;
+
 import com.fasterxml.jackson.core.*;
 import com.fasterxml.jackson.core.base.ParserMinimalBase;
 import com.fasterxml.jackson.core.io.IOContext;
 import com.fasterxml.jackson.core.json.JsonReadContext;
 import com.fasterxml.jackson.core.util.JacksonFeatureSet;
-import com.amazon.ion.*;
-import com.amazon.ion.system.IonSystemBuilder;
 
 /**
  * Implementation of {@link JsonParser} that will use an underlying

ion/src/main/java/com/fasterxml/jackson/dataformat/ion/IonSymbolSerializer.java

@@ -19,10 +19,7 @@
 
 import com.fasterxml.jackson.core.JsonGenerationException;
 import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.JsonMappingException;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatVisitorWrapper;
 import com.fasterxml.jackson.databind.ser.std.StdScalarSerializer;
 

ion/src/main/java/com/fasterxml/jackson/dataformat/ion/IonTimestampDeserializers.java

@@ -16,12 +16,13 @@
 
 import java.io.IOException;
 
+import com.amazon.ion.Timestamp;
+
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonToken;
 import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.deser.std.DateDeserializers.DateDeserializer;
 import com.fasterxml.jackson.databind.deser.std.DateDeserializers.SqlDateDeserializer;
-import com.amazon.ion.Timestamp;
 
 /**
  * A date deserializer that uses native Ion timestamps instead of JSON strings.

ion/src/main/java/com/fasterxml/jackson/dataformat/ion/IonTimestampSerializers.java

@@ -19,7 +19,6 @@
 import java.util.TimeZone;
 
 import com.fasterxml.jackson.core.JsonGenerator;
-
 import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.ser.std.StdScalarSerializer;

ion/src/main/java/com/fasterxml/jackson/dataformat/ion/ionvalue/DeserializersEx.java

@@ -14,16 +14,13 @@
 
 package com.fasterxml.jackson.dataformat.ion.ionvalue;
 
-import com.fasterxml.jackson.databind.BeanDescription;
-import com.fasterxml.jackson.databind.DeserializationConfig;
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.JsonDeserializer;
-import com.fasterxml.jackson.databind.JsonMappingException;
+import com.amazon.ion.IonContainer;
+import com.amazon.ion.IonValue;
+
+import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.jsontype.TypeDeserializer;
 import com.fasterxml.jackson.databind.module.SimpleDeserializers;
 import com.fasterxml.jackson.databind.type.CollectionType;
-import com.amazon.ion.IonContainer;
-import com.amazon.ion.IonValue;
 
 class DeserializersEx extends SimpleDeserializers
 {