Skip to content

Commit f27a877

Browse files
cowtowncodercowtowncoder
committed
Merge branch '2.19'
2 parents fc246a9 + d42fad9 commit f27a877

File tree

52 files changed

+541
-620
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+541
-620
lines changed

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,7 @@
1717
import tools.jackson.core.JsonGenerator;
1818
import tools.jackson.core.exc.StreamWriteException;
1919

20-
import tools.jackson.databind.JavaType;
21-
import tools.jackson.databind.SerializationFeature;
22-
import tools.jackson.databind.SerializationContext;
20+
import tools.jackson.databind.*;
2321
import tools.jackson.databind.jsonFormatVisitors.JsonFormatVisitorWrapper;
2422
import tools.jackson.databind.ser.std.StdScalarSerializer;
2523

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
public class IonParser
3737
extends ParserMinimalBase
3838
{
39-
// @since 2.14
4039
protected final static JacksonFeatureSet<StreamReadCapability> ION_READ_CAPABILITIES
4140
= DEFAULT_READ_CAPABILITIES.with(StreamReadCapability.EXACT_FLOATS);
4241

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

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,14 @@
1414

1515
package tools.jackson.dataformat.ion.ionvalue;
1616

17-
import tools.jackson.databind.BeanDescription;
18-
import tools.jackson.databind.DeserializationConfig;
19-
import tools.jackson.databind.JavaType;
20-
import tools.jackson.databind.ValueDeserializer;
17+
import com.amazon.ion.IonContainer;
18+
import com.amazon.ion.IonValue;
19+
20+
import tools.jackson.databind.*;
2121
import tools.jackson.databind.jsontype.TypeDeserializer;
2222
import tools.jackson.databind.module.SimpleDeserializers;
2323
import tools.jackson.databind.type.CollectionType;
2424

25-
import com.amazon.ion.IonContainer;
26-
import com.amazon.ion.IonValue;
27-
2825
class DeserializersEx extends SimpleDeserializers
2926
{
3027
private static final long serialVersionUID = 1L;

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

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,13 @@
1414

1515
package tools.jackson.dataformat.ion.ionvalue;
1616

17-
import tools.jackson.core.JacksonException;
18-
import tools.jackson.core.JsonParser;
19-
import tools.jackson.core.JsonToken;
20-
import tools.jackson.databind.DatabindException;
21-
import tools.jackson.databind.DeserializationContext;
22-
import tools.jackson.databind.ValueDeserializer;
17+
import com.amazon.ion.*;
18+
19+
import tools.jackson.core.*;
20+
import tools.jackson.databind.*;
2321
import tools.jackson.databind.util.AccessPattern;
2422
import tools.jackson.dataformat.ion.IonParser;
2523

26-
import com.amazon.ion.IonSystem;
27-
import com.amazon.ion.IonValue;
28-
import com.amazon.ion.Timestamp;
29-
3024
/**
3125
* Deserializer that knows how to deserialize an IonValue.
3226
*/

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@
1414

1515
package tools.jackson.dataformat.ion.ionvalue;
1616

17+
import com.amazon.ion.IonValue;
18+
1719
import tools.jackson.core.JsonGenerator;
1820
import tools.jackson.databind.SerializationContext;
1921
import tools.jackson.databind.ser.std.StdScalarSerializer;
2022
import tools.jackson.dataformat.ion.IonGenerator;
2123

22-
import com.amazon.ion.IonValue;
23-
2424
/**
2525
* Serializer that knows how to serialize an IonValue.
2626
*/

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,11 @@
1414

1515
package tools.jackson.dataformat.ion.ionvalue;
1616

17+
import com.amazon.ion.Timestamp;
18+
1719
import tools.jackson.core.JsonParser;
1820
import tools.jackson.databind.DeserializationContext;
1921
import tools.jackson.databind.ValueDeserializer;
20-
import com.amazon.ion.Timestamp;
2122

2223
/**
2324
* Deserializer that knows how to deserialize a Timestamp.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@
1414

1515
package tools.jackson.dataformat.ion.ionvalue;
1616

17+
import com.amazon.ion.Timestamp;
18+
1719
import tools.jackson.core.JsonGenerator;
1820
import tools.jackson.databind.SerializationContext;
1921
import tools.jackson.databind.ser.std.StdScalarSerializer;
2022
import tools.jackson.dataformat.ion.IonGenerator;
2123

22-
import com.amazon.ion.Timestamp;
23-
2424
/**
2525
* Serializer that knows how to serialize a Timestamp.
2626
*/

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
package tools.jackson.dataformat.ion.jsr310;
22

33
import java.math.BigDecimal;
4-
import java.time.Instant;
5-
import java.time.OffsetDateTime;
6-
import java.time.ZoneId;
7-
import java.time.ZoneOffset;
8-
import java.time.ZonedDateTime;
4+
import java.time.*;
95
import java.time.temporal.Temporal;
106
import java.util.function.BiFunction;
117

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

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
package tools.jackson.dataformat.ion.jsr310;
22

3-
import java.time.Instant;
4-
import java.time.OffsetDateTime;
5-
import java.time.ZoneId;
6-
import java.time.ZoneOffset;
7-
import java.time.ZonedDateTime;
3+
import java.time.*;
84
import java.time.temporal.Temporal;
95
import java.util.function.BiFunction;
106
import java.util.function.Function;
@@ -15,10 +11,7 @@
1511
import tools.jackson.core.JacksonException;
1612
import tools.jackson.core.JsonGenerator;
1713

18-
import tools.jackson.databind.BeanProperty;
19-
import tools.jackson.databind.ValueSerializer;
20-
import tools.jackson.databind.SerializationFeature;
21-
import tools.jackson.databind.SerializationContext;
14+
import tools.jackson.databind.*;
2215
import tools.jackson.databind.ser.std.StdScalarSerializer;
2316
import tools.jackson.dataformat.ion.IonGenerator;
2417

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,7 @@
2020
import tools.jackson.core.JsonParser;
2121
import tools.jackson.core.exc.StreamReadException;
2222

23-
import tools.jackson.databind.BeanProperty;
24-
import tools.jackson.databind.DeserializationContext;
25-
import tools.jackson.databind.JavaType;
26-
import tools.jackson.databind.ValueDeserializer;
23+
import tools.jackson.databind.*;
2724
import tools.jackson.databind.jsontype.TypeDeserializer;
2825
import tools.jackson.databind.jsontype.TypeIdResolver;
2926
import tools.jackson.databind.jsontype.impl.TypeDeserializerBase;

0 commit comments

Comments
 (0)