[ JSTEP-10 ] Migrate ion module tests to JUnit 5 (#551)

FasterXML · Jan 12, 2025 · d42fad9 · d42fad9
1 parent 26b5e2a
commit d42fad9
Show file tree

Hide file tree

Showing 65 changed files with 587 additions and 719 deletions.
diff --git a/ion/src/main/java/com/fasterxml/jackson/dataformat/ion/EnumAsIonSymbolSerializer.java b/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;
 

diff --git a/ion/src/main/java/com/fasterxml/jackson/dataformat/ion/IonFactory.java b/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.

diff --git a/ion/src/main/java/com/fasterxml/jackson/dataformat/ion/IonFactoryBuilder.java b/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.

diff --git a/ion/src/main/java/com/fasterxml/jackson/dataformat/ion/IonGenerator.java b/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.

diff --git a/ion/src/main/java/com/fasterxml/jackson/dataformat/ion/IonObjectMapper.java b/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}

diff --git a/ion/src/main/java/com/fasterxml/jackson/dataformat/ion/IonParser.java b/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

diff --git a/ion/src/main/java/com/fasterxml/jackson/dataformat/ion/IonSymbolSerializer.java b/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;
 

diff --git a/ion/src/main/java/com/fasterxml/jackson/dataformat/ion/IonTimestampDeserializers.java b/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.

diff --git a/ion/src/main/java/com/fasterxml/jackson/dataformat/ion/IonTimestampSerializers.java b/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;

diff --git a/ion/src/main/java/com/fasterxml/jackson/dataformat/ion/ionvalue/DeserializersEx.java b/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
 {

diff --git a/ion/src/main/java/com/fasterxml/jackson/dataformat/ion/ionvalue/IonValueDeserializer.java b/ion/src/main/java/com/fasterxml/jackson/dataformat/ion/ionvalue/IonValueDeserializer.java
@@ -16,16 +16,13 @@
 
 import java.io.IOException;
 
+import com.amazon.ion.*;
+
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonToken;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.JsonMappingException;
-import com.fasterxml.jackson.databind.JsonDeserializer;
+import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.util.AccessPattern;
 import com.fasterxml.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.

diff --git a/ion/src/main/java/com/fasterxml/jackson/dataformat/ion/ionvalue/IonValueMapper.java b/ion/src/main/java/com/fasterxml/jackson/dataformat/ion/ionvalue/IonValueMapper.java
@@ -16,16 +16,14 @@
 
 import java.io.IOException;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.PropertyNamingStrategy;
-import com.fasterxml.jackson.dataformat.ion.EnumAsIonSymbolModule;
-import com.fasterxml.jackson.dataformat.ion.IonFactory;
-import com.fasterxml.jackson.dataformat.ion.IonObjectMapper;
-
 import com.amazon.ion.IonSystem;
 import com.amazon.ion.IonValue;
 import com.amazon.ion.system.IonSystemBuilder;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.PropertyNamingStrategy;
+import com.fasterxml.jackson.dataformat.ion.*;
+
 /**
  * Supports serializing Ion to POJO and back using the Jackson Ion framework.
  *

diff --git a/ion/src/main/java/com/fasterxml/jackson/dataformat/ion/ionvalue/IonValueModule.java b/ion/src/main/java/com/fasterxml/jackson/dataformat/ion/ionvalue/IonValueModule.java
@@ -14,11 +14,11 @@
 
 package com.fasterxml.jackson.dataformat.ion.ionvalue;
 
+import com.amazon.ion.Timestamp;
+
 import com.fasterxml.jackson.databind.module.SimpleModule;
 import com.fasterxml.jackson.dataformat.ion.PackageVersion;
 
-import com.amazon.ion.Timestamp;
-
 /**
  * A module which allows for the direct serialization to and from IonValue fields. The POJO can declare fields of type
  * IonValue (or a subclass) and the direct value will be provided.

diff --git a/ion/src/main/java/com/fasterxml/jackson/dataformat/ion/ionvalue/IonValueSerializer.java b/ion/src/main/java/com/fasterxml/jackson/dataformat/ion/ionvalue/IonValueSerializer.java
@@ -16,13 +16,13 @@
 
 import java.io.IOException;
 
+import com.amazon.ion.IonValue;
+
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.ser.std.StdScalarSerializer;
 import com.fasterxml.jackson.dataformat.ion.IonGenerator;
 
-import com.amazon.ion.IonValue;
-
 /**
  * Serializer that knows how to serialize an IonValue.
  */

diff --git a/ion/src/main/java/com/fasterxml/jackson/dataformat/ion/ionvalue/TimestampDeserializer.java b/ion/src/main/java/com/fasterxml/jackson/dataformat/ion/ionvalue/TimestampDeserializer.java
@@ -16,10 +16,11 @@
 
 import java.io.IOException;
 
+import com.amazon.ion.Timestamp;
+
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.JsonDeserializer;
-import com.amazon.ion.Timestamp;
 
 /**
  * Deserializer that knows how to deserialize a Timestamp.

diff --git a/ion/src/main/java/com/fasterxml/jackson/dataformat/ion/ionvalue/TimestampSerializer.java b/ion/src/main/java/com/fasterxml/jackson/dataformat/ion/ionvalue/TimestampSerializer.java
@@ -16,13 +16,13 @@
 
 import java.io.IOException;
 
+import com.amazon.ion.Timestamp;
+
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.ser.std.StdScalarSerializer;
 import com.fasterxml.jackson.dataformat.ion.IonGenerator;
 
-import com.amazon.ion.Timestamp;
-
 /**
  * Serializer that knows how to serialize a Timestamp.
  */

diff --git a/ion/src/main/java/com/fasterxml/jackson/dataformat/ion/jsr310/IonJavaTimeModule.java b/ion/src/main/java/com/fasterxml/jackson/dataformat/ion/jsr310/IonJavaTimeModule.java
@@ -1,11 +1,8 @@
 package com.fasterxml.jackson.dataformat.ion.jsr310;
 
-import java.time.Instant;
-import java.time.OffsetDateTime;
-import java.time.ZonedDateTime;
+import java.time.*;
 
 import com.fasterxml.jackson.databind.module.SimpleModule;
-
 import com.fasterxml.jackson.dataformat.ion.PackageVersion;
 
 /**

diff --git a/...ain/java/com/fasterxml/jackson/dataformat/ion/jsr310/IonTimestampInstantDeserializer.java b/...ain/java/com/fasterxml/jackson/dataformat/ion/jsr310/IonTimestampInstantDeserializer.java
@@ -2,24 +2,17 @@
 
 import java.io.IOException;
 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;
 
 import com.amazon.ion.Timestamp;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonFormat.Feature;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.BeanProperty;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.JsonDeserializer;
-import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.deser.ContextualDeserializer;
 import com.fasterxml.jackson.databind.deser.std.StdScalarDeserializer;
 

diff --git a/.../main/java/com/fasterxml/jackson/dataformat/ion/jsr310/IonTimestampInstantSerializer.java b/.../main/java/com/fasterxml/jackson/dataformat/ion/jsr310/IonTimestampInstantSerializer.java
@@ -1,23 +1,15 @@
 package com.fasterxml.jackson.dataformat.ion.jsr310;
 
 import java.io.IOException;
-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;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonFormat.Feature;
 import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.databind.BeanProperty;
-import com.fasterxml.jackson.databind.JsonMappingException;
-import com.fasterxml.jackson.databind.JsonSerializer;
-import com.fasterxml.jackson.databind.SerializationFeature;
-import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.ser.ContextualSerializer;
 import com.fasterxml.jackson.databind.ser.std.StdScalarSerializer;
 import com.fasterxml.jackson.dataformat.ion.IonGenerator;

diff --git a/...java/com/fasterxml/jackson/dataformat/ion/polymorphism/IonAnnotationTypeDeserializer.java b/...java/com/fasterxml/jackson/dataformat/ion/polymorphism/IonAnnotationTypeDeserializer.java
@@ -17,13 +17,8 @@
 import java.io.IOException;
 
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import com.fasterxml.jackson.core.JsonParseException;
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.BeanProperty;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.JsonDeserializer;
+import com.fasterxml.jackson.core.*;
+import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.jsontype.TypeDeserializer;
 import com.fasterxml.jackson.databind.jsontype.TypeIdResolver;
 import com.fasterxml.jackson.databind.jsontype.impl.TypeDeserializerBase;

diff --git a/...a/com/fasterxml/jackson/dataformat/ion/polymorphism/IonAnnotationTypeResolverBuilder.java b/...a/com/fasterxml/jackson/dataformat/ion/polymorphism/IonAnnotationTypeResolverBuilder.java
@@ -17,15 +17,8 @@
 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.jsontype.NamedType;
-import com.fasterxml.jackson.databind.jsontype.TypeDeserializer;
-import com.fasterxml.jackson.databind.jsontype.TypeIdResolver;
-import com.fasterxml.jackson.databind.jsontype.TypeResolverBuilder;
-import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
+import com.fasterxml.jackson.databind.*;
+import com.fasterxml.jackson.databind.jsontype.*;
 
 /**
  * A {@link TypeResolverBuilder} which produces {@link TypeSerializer}s and {@link TypeDeserializer}s that use