Skip to content

Commit 7ebd3a0

Browse files
cowtowncodercowtowncoder
committed
Sync with databind
1 parent e19ea05 commit 7ebd3a0

File tree

10 files changed

+43
-47
lines changed

10 files changed

+43
-47
lines changed

‎datetime/src/main/java/com/fasterxml/jackson/datatype/jsr310/deser/JSR310StringParsableDeserializer.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,13 @@ public class JSR310StringParsableDeserializer
5454
public static final JsonDeserializer<ZoneOffset> ZONE_OFFSET =
5555
createDeserializer(ZoneOffset.class, TYPE_ZONE_OFFSET);
5656

57-
protected final int _valueType;
57+
protected final int _typeSelector;
5858

5959
@SuppressWarnings("unchecked")
60-
protected JSR310StringParsableDeserializer(Class<?> supportedType, int valueId)
60+
protected JSR310StringParsableDeserializer(Class<?> supportedType, int type)
6161
{
6262
super((Class<Object>)supportedType);
63-
_valueType = valueId;
63+
_typeSelector = type;
6464
}
6565

6666
@SuppressWarnings("unchecked")
@@ -77,7 +77,7 @@ public Object deserialize(JsonParser parser, DeserializationContext context) thr
7777
return _coerceEmptyString(context, false);
7878
}
7979
try {
80-
switch (_valueType) {
80+
switch (_typeSelector) {
8181
case TYPE_PERIOD:
8282
return Period.parse(string);
8383
case TYPE_ZONE_ID:

‎datetime/src/main/java/com/fasterxml/jackson/datatype/jsr310/ser/JSR310SerializerBase.java

+5-7
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,18 @@
1616
*/
1717
abstract class JSR310SerializerBase<T> extends StdSerializer<T>
1818
{
19-
private static final long serialVersionUID = 1L;
20-
2119
protected JSR310SerializerBase(Class<?> supportedType) {
2220
super(supportedType);
2321
}
2422

2523
@Override
26-
public void serializeWithType(T value, JsonGenerator g, SerializerProvider provider,
24+
public void serializeWithType(T value, JsonGenerator g, SerializerProvider ctxt,
2725
TypeSerializer typeSer) throws IOException
2826
{
29-
WritableTypeId typeIdDef = typeSer.writeTypePrefix(g,
30-
typeSer.typeId(value, serializationShape(provider)));
31-
serialize(value, g, provider);
32-
typeSer.writeTypeSuffix(g, typeIdDef);
27+
WritableTypeId typeIdDef = typeSer.writeTypePrefix(g, ctxt,
28+
typeSer.typeId(value, serializationShape(ctxt)));
29+
serialize(value, g, ctxt);
30+
typeSer.writeTypeSuffix(g, ctxt, typeIdDef);
3331
}
3432

3533
/**

‎datetime/src/main/java/com/fasterxml/jackson/datatype/jsr310/ser/LocalDateSerializer.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -76,22 +76,22 @@ public void serialize(LocalDate date, JsonGenerator g, SerializerProvider provid
7676

7777
@Override
7878
public void serializeWithType(LocalDate value, JsonGenerator g,
79-
SerializerProvider provider, TypeSerializer typeSer) throws IOException
79+
SerializerProvider ctxt, TypeSerializer typeSer) throws IOException
8080
{
81-
WritableTypeId typeIdDef = typeSer.writeTypePrefix(g,
82-
typeSer.typeId(value, serializationShape(provider)));
81+
WritableTypeId typeIdDef = typeSer.writeTypePrefix(g, ctxt,
82+
typeSer.typeId(value, serializationShape(ctxt)));
8383
// need to write out to avoid double-writing array markers
8484
switch (typeIdDef.valueShape) {
8585
case START_ARRAY:
86-
_serializeAsArrayContents(value, g, provider);
86+
_serializeAsArrayContents(value, g, ctxt);
8787
break;
8888
case VALUE_NUMBER_INT:
8989
g.writeNumber(value.toEpochDay());
9090
break;
9191
default:
9292
g.writeString((_formatter == null) ? value.toString() : value.format(_formatter));
9393
}
94-
typeSer.writeTypeSuffix(g, typeIdDef);
94+
typeSer.writeTypeSuffix(g, ctxt, typeIdDef);
9595
}
9696

9797
protected void _serializeAsArrayContents(LocalDate value, JsonGenerator g,

‎datetime/src/main/java/com/fasterxml/jackson/datatype/jsr310/ser/LocalDateTimeSerializer.java

+5-6
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
* Serializer for Java 8 temporal {@link LocalDateTime}s.
3333
*
3434
* @author Nick Williams
35-
* @since 2.2
3635
*/
3736
public class LocalDateTimeSerializer extends JSR310FormattedSerializerBase<LocalDateTime>
3837
{
@@ -79,22 +78,22 @@ public void serialize(LocalDateTime value, JsonGenerator g, SerializerProvider p
7978
}
8079

8180
@Override
82-
public void serializeWithType(LocalDateTime value, JsonGenerator g, SerializerProvider provider,
81+
public void serializeWithType(LocalDateTime value, JsonGenerator g, SerializerProvider ctxt,
8382
TypeSerializer typeSer) throws IOException
8483
{
85-
WritableTypeId typeIdDef = typeSer.writeTypePrefix(g,
86-
typeSer.typeId(value, serializationShape(provider)));
84+
WritableTypeId typeIdDef = typeSer.writeTypePrefix(g, ctxt,
85+
typeSer.typeId(value, serializationShape(ctxt)));
8786
// need to write out to avoid double-writing array markers
8887
if (typeIdDef.valueShape == JsonToken.START_ARRAY) {
89-
_serializeAsArrayContents(value, g, provider);
88+
_serializeAsArrayContents(value, g, ctxt);
9089
} else {
9190
DateTimeFormatter dtf = _formatter;
9291
if (dtf == null) {
9392
dtf = _defaultFormatter();
9493
}
9594
g.writeString(value.format(dtf));
9695
}
97-
typeSer.writeTypeSuffix(g, typeIdDef);
96+
typeSer.writeTypeSuffix(g, ctxt, typeIdDef);
9897
}
9998

10099
private final void _serializeAsArrayContents(LocalDateTime value, JsonGenerator g,

‎datetime/src/main/java/com/fasterxml/jackson/datatype/jsr310/ser/LocalTimeSerializer.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -85,21 +85,21 @@ public void serialize(LocalTime value, JsonGenerator g, SerializerProvider provi
8585

8686
@Override
8787
public void serializeWithType(LocalTime value, JsonGenerator g,
88-
SerializerProvider provider, TypeSerializer typeSer) throws IOException
88+
SerializerProvider ctxt, TypeSerializer typeSer) throws IOException
8989
{
90-
WritableTypeId typeIdDef = typeSer.writeTypePrefix(g,
91-
typeSer.typeId(value, serializationShape(provider)));
90+
WritableTypeId typeIdDef = typeSer.writeTypePrefix(g, ctxt,
91+
typeSer.typeId(value, serializationShape(ctxt)));
9292
// need to write out to avoid double-writing array markers
9393
if (typeIdDef.valueShape == JsonToken.START_ARRAY) {
94-
_serializeAsArrayContents(value, g, provider);
94+
_serializeAsArrayContents(value, g, ctxt);
9595
} else {
9696
DateTimeFormatter dtf = _formatter;
9797
if (dtf == null) {
9898
dtf = _defaultFormatter();
9999
}
100100
g.writeString(value.format(dtf));
101101
}
102-
typeSer.writeTypeSuffix(g, typeIdDef);
102+
typeSer.writeTypeSuffix(g, ctxt, typeIdDef);
103103
}
104104

105105
private final void _serializeAsArrayContents(LocalTime value, JsonGenerator g,
@@ -122,7 +122,7 @@ private final void _serializeAsArrayContents(LocalTime value, JsonGenerator g,
122122
}
123123
}
124124

125-
@Override // since 2.9
125+
@Override
126126
protected JsonToken serializationShape(SerializerProvider provider) {
127127
return useTimestamp(provider) ? JsonToken.START_ARRAY : JsonToken.VALUE_STRING;
128128
}

‎datetime/src/main/java/com/fasterxml/jackson/datatype/jsr310/ser/MonthDaySerializer.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -75,17 +75,17 @@ public void serialize(MonthDay value, JsonGenerator g, SerializerProvider provid
7575

7676
@Override
7777
public void serializeWithType(MonthDay value, JsonGenerator g,
78-
SerializerProvider provider, TypeSerializer typeSer) throws IOException
78+
SerializerProvider ctxt, TypeSerializer typeSer) throws IOException
7979
{
80-
WritableTypeId typeIdDef = typeSer.writeTypePrefix(g,
81-
typeSer.typeId(value, serializationShape(provider)));
80+
WritableTypeId typeIdDef = typeSer.writeTypePrefix(g, ctxt,
81+
typeSer.typeId(value, serializationShape(ctxt)));
8282
// need to write out to avoid double-writing array markers
8383
if (typeIdDef.valueShape == JsonToken.START_ARRAY) {
84-
_serializeAsArrayContents(value, g, provider);
84+
_serializeAsArrayContents(value, g, ctxt);
8585
} else {
8686
g.writeString((_formatter == null) ? value.toString() : value.format(_formatter));
8787
}
88-
typeSer.writeTypeSuffix(g, typeIdDef);
88+
typeSer.writeTypeSuffix(g, ctxt, typeIdDef);
8989
}
9090

9191
protected void _serializeAsArrayContents(MonthDay value, JsonGenerator g,
@@ -95,7 +95,7 @@ protected void _serializeAsArrayContents(MonthDay value, JsonGenerator g,
9595
g.writeNumber(value.getDayOfMonth());
9696
}
9797

98-
@Override // since 2.9
98+
@Override
9999
protected JsonToken serializationShape(SerializerProvider provider) {
100100
return _useTimestampExplicitOnly(provider) ? JsonToken.START_ARRAY : JsonToken.VALUE_STRING;
101101
}

‎datetime/src/main/java/com/fasterxml/jackson/datatype/jsr310/ser/OffsetTimeSerializer.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -72,19 +72,19 @@ public void serialize(OffsetTime time, JsonGenerator g, SerializerProvider provi
7272
}
7373

7474
@Override
75-
public void serializeWithType(OffsetTime value, JsonGenerator g, SerializerProvider provider,
75+
public void serializeWithType(OffsetTime value, JsonGenerator g, SerializerProvider ctxt,
7676
TypeSerializer typeSer) throws IOException
7777
{
78-
WritableTypeId typeIdDef = typeSer.writeTypePrefix(g,
79-
typeSer.typeId(value, serializationShape(provider)));
78+
WritableTypeId typeIdDef = typeSer.writeTypePrefix(g, ctxt,
79+
typeSer.typeId(value, serializationShape(ctxt)));
8080
// need to write out to avoid double-writing array markers
8181
if (typeIdDef.valueShape == JsonToken.START_ARRAY) {
82-
_serializeAsArrayContents(value, g, provider);
82+
_serializeAsArrayContents(value, g, ctxt);
8383
} else {
8484
String str = (_formatter == null) ? value.toString() : value.format(_formatter);
8585
g.writeString(str);
8686
}
87-
typeSer.writeTypeSuffix(g, typeIdDef);
87+
typeSer.writeTypeSuffix(g, ctxt, typeIdDef);
8888
}
8989

9090
private final void _serializeAsArrayContents(OffsetTime value, JsonGenerator g,

‎datetime/src/main/java/com/fasterxml/jackson/datatype/jsr310/ser/YearMonthSerializer.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -75,19 +75,19 @@ public void serialize(YearMonth value, JsonGenerator g, SerializerProvider provi
7575

7676
@Override
7777
public void serializeWithType(YearMonth value, JsonGenerator g,
78-
SerializerProvider provider, TypeSerializer typeSer) throws IOException
78+
SerializerProvider ctxt, TypeSerializer typeSer) throws IOException
7979
{
80-
WritableTypeId typeIdDef = typeSer.writeTypePrefix(g,
81-
typeSer.typeId(value, serializationShape(provider)));
80+
WritableTypeId typeIdDef = typeSer.writeTypePrefix(g, ctxt,
81+
typeSer.typeId(value, serializationShape(ctxt)));
8282
// need to write out to avoid double-writing array markers
8383
if (typeIdDef.valueShape == JsonToken.START_ARRAY) {
84-
_serializeAsArrayContents(value, g, provider);
84+
_serializeAsArrayContents(value, g, ctxt);
8585
} else {
8686
g.writeString((_formatter == null) ? value.toString() : value.format(_formatter));
8787
}
88-
typeSer.writeTypeSuffix(g, typeIdDef);
88+
typeSer.writeTypeSuffix(g, ctxt, typeIdDef);
8989
}
90-
90+
9191
protected void _serializeAsArrayContents(YearMonth value, JsonGenerator g,
9292
SerializerProvider provider) throws IOException
9393
{

‎datetime/src/test/java/com/fasterxml/jackson/datatype/jsr310/deser/ZoneOffsetDeserTest.java

-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626

2727
import com.fasterxml.jackson.databind.*;
2828
import com.fasterxml.jackson.databind.exc.MismatchedInputException;
29-
import com.fasterxml.jackson.databind.json.JsonMapper;
3029
import com.fasterxml.jackson.datatype.jsr310.MockObjectConfiguration;
3130
import com.fasterxml.jackson.datatype.jsr310.ModuleTestBase;
3231

‎datetime/src/test/java/com/fasterxml/jackson/datatype/jsr310/key/ZonedDateTimeAsKeyTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public class ZonedDateTimeAsKeyTest extends ModuleTestBase
2121
};
2222
private static final ZonedDateTime DATE_TIME_0 = ZonedDateTime.ofInstant(Instant.ofEpochSecond(0), ZoneOffset.UTC);
2323
private static final String DATE_TIME_0_STRING = "1970-01-01T00:00:00Z";
24-
private static final Instant DATE_TIME_0_INSTANT = DATE_TIME_0.toInstant();
24+
// private static final Instant DATE_TIME_0_INSTANT = DATE_TIME_0.toInstant();
2525

2626
private static final ZonedDateTime DATE_TIME_1 = ZonedDateTime.of(
2727
2015, 3, 14, 9, 26, 53, 590 * 1000 * 1000, ZoneOffset.UTC);

0 commit comments

Comments
 (0)