Merge branch '2.19'

Author: cowtowncoder

ion/src/main/java/tools/jackson/dataformat/ion/EnumAsIonSymbolSerializer.java

@@ -17,9 +17,7 @@
 import tools.jackson.core.JsonGenerator;
 import tools.jackson.core.exc.StreamWriteException;
 
-import tools.jackson.databind.JavaType;
-import tools.jackson.databind.SerializationFeature;
-import tools.jackson.databind.SerializationContext;
+import tools.jackson.databind.*;
 import tools.jackson.databind.jsonFormatVisitors.JsonFormatVisitorWrapper;
 import tools.jackson.databind.ser.std.StdScalarSerializer;
 

ion/src/main/java/tools/jackson/dataformat/ion/IonParser.java

@@ -36,7 +36,6 @@
 public class IonParser
     extends ParserMinimalBase
 {
-    // @since 2.14
     protected final static JacksonFeatureSet<StreamReadCapability> ION_READ_CAPABILITIES
         = DEFAULT_READ_CAPABILITIES.with(StreamReadCapability.EXACT_FLOATS);
 

ion/src/main/java/tools/jackson/dataformat/ion/ionvalue/DeserializersEx.java

@@ -14,17 +14,14 @@
 
 package tools.jackson.dataformat.ion.ionvalue;
 
-import tools.jackson.databind.BeanDescription;
-import tools.jackson.databind.DeserializationConfig;
-import tools.jackson.databind.JavaType;
-import tools.jackson.databind.ValueDeserializer;
+import com.amazon.ion.IonContainer;
+import com.amazon.ion.IonValue;
+
+import tools.jackson.databind.*;
 import tools.jackson.databind.jsontype.TypeDeserializer;
 import tools.jackson.databind.module.SimpleDeserializers;
 import tools.jackson.databind.type.CollectionType;
 
-import com.amazon.ion.IonContainer;
-import com.amazon.ion.IonValue;
-
 class DeserializersEx extends SimpleDeserializers
 {
     private static final long serialVersionUID = 1L;

ion/src/main/java/tools/jackson/dataformat/ion/ionvalue/IonValueDeserializer.java

@@ -14,19 +14,13 @@
 
 package tools.jackson.dataformat.ion.ionvalue;
 
-import tools.jackson.core.JacksonException;
-import tools.jackson.core.JsonParser;
-import tools.jackson.core.JsonToken;
-import tools.jackson.databind.DatabindException;
-import tools.jackson.databind.DeserializationContext;
-import tools.jackson.databind.ValueDeserializer;
+import com.amazon.ion.*;
+
+import tools.jackson.core.*;
+import tools.jackson.databind.*;
 import tools.jackson.databind.util.AccessPattern;
 import tools.jackson.dataformat.ion.IonParser;
 
-import com.amazon.ion.IonSystem;
-import com.amazon.ion.IonValue;
-import com.amazon.ion.Timestamp;
-
 /**
  * Deserializer that knows how to deserialize an IonValue.
  */

ion/src/main/java/tools/jackson/dataformat/ion/ionvalue/IonValueSerializer.java

@@ -14,13 +14,13 @@
 
 package tools.jackson.dataformat.ion.ionvalue;
 
+import com.amazon.ion.IonValue;
+
 import tools.jackson.core.JsonGenerator;
 import tools.jackson.databind.SerializationContext;
 import tools.jackson.databind.ser.std.StdScalarSerializer;
 import tools.jackson.dataformat.ion.IonGenerator;
 
-import com.amazon.ion.IonValue;
-
 /**
  * Serializer that knows how to serialize an IonValue.
  */

ion/src/main/java/tools/jackson/dataformat/ion/ionvalue/TimestampDeserializer.java

@@ -14,10 +14,11 @@
 
 package tools.jackson.dataformat.ion.ionvalue;
 
+import com.amazon.ion.Timestamp;
+
 import tools.jackson.core.JsonParser;
 import tools.jackson.databind.DeserializationContext;
 import tools.jackson.databind.ValueDeserializer;
-import com.amazon.ion.Timestamp;
 
 /**
  * Deserializer that knows how to deserialize a Timestamp.

ion/src/main/java/tools/jackson/dataformat/ion/ionvalue/TimestampSerializer.java

@@ -14,13 +14,13 @@
 
 package tools.jackson.dataformat.ion.ionvalue;
 
+import com.amazon.ion.Timestamp;
+
 import tools.jackson.core.JsonGenerator;
 import tools.jackson.databind.SerializationContext;
 import tools.jackson.databind.ser.std.StdScalarSerializer;
 import tools.jackson.dataformat.ion.IonGenerator;
 
-import com.amazon.ion.Timestamp;
-
 /**
  * Serializer that knows how to serialize a Timestamp.
  */

ion/src/main/java/tools/jackson/dataformat/ion/jsr310/IonTimestampInstantDeserializer.java

@@ -1,11 +1,7 @@
 package tools.jackson.dataformat.ion.jsr310;
 
 import java.math.BigDecimal;
-import java.time.Instant;
-import java.time.OffsetDateTime;
-import java.time.ZoneId;
-import java.time.ZoneOffset;
-import java.time.ZonedDateTime;
+import java.time.*;
 import java.time.temporal.Temporal;
 import java.util.function.BiFunction;
 

ion/src/main/java/tools/jackson/dataformat/ion/jsr310/IonTimestampInstantSerializer.java

@@ -1,10 +1,6 @@
 package tools.jackson.dataformat.ion.jsr310;
 
-import java.time.Instant;
-import java.time.OffsetDateTime;
-import java.time.ZoneId;
-import java.time.ZoneOffset;
-import java.time.ZonedDateTime;
+import java.time.*;
 import java.time.temporal.Temporal;
 import java.util.function.BiFunction;
 import java.util.function.Function;
@@ -15,10 +11,7 @@
 import tools.jackson.core.JacksonException;
 import tools.jackson.core.JsonGenerator;
 
-import tools.jackson.databind.BeanProperty;
-import tools.jackson.databind.ValueSerializer;
-import tools.jackson.databind.SerializationFeature;
-import tools.jackson.databind.SerializationContext;
+import tools.jackson.databind.*;
 import tools.jackson.databind.ser.std.StdScalarSerializer;
 import tools.jackson.dataformat.ion.IonGenerator;
 

ion/src/main/java/tools/jackson/dataformat/ion/polymorphism/IonAnnotationTypeDeserializer.java

@@ -20,10 +20,7 @@
 import tools.jackson.core.JsonParser;
 import tools.jackson.core.exc.StreamReadException;
 
-import tools.jackson.databind.BeanProperty;
-import tools.jackson.databind.DeserializationContext;
-import tools.jackson.databind.JavaType;
-import tools.jackson.databind.ValueDeserializer;
+import tools.jackson.databind.*;
 import tools.jackson.databind.jsontype.TypeDeserializer;
 import tools.jackson.databind.jsontype.TypeIdResolver;
 import tools.jackson.databind.jsontype.impl.TypeDeserializerBase;