Skip to content

Commit c233b02

Browse files
committed
Backport #50 in 2.10, update release notes
1 parent b0b2186 commit c233b02

File tree

4 files changed

+18
-4
lines changed

4 files changed

+18
-4
lines changed

guava/src/main/java/com/fasterxml/jackson/datatype/guava/deser/RangeSetDeserializer.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,18 @@
66
import com.fasterxml.jackson.databind.DeserializationContext;
77
import com.fasterxml.jackson.databind.JavaType;
88
import com.fasterxml.jackson.databind.JsonDeserializer;
9+
import com.fasterxml.jackson.databind.deser.ContextualDeserializer;
910
import com.google.common.collect.ImmutableRangeSet;
1011
import com.google.common.collect.Range;
1112
import com.google.common.collect.RangeSet;
1213

1314
import java.io.IOException;
1415
import java.util.List;
1516

16-
public class RangeSetDeserializer extends JsonDeserializer<RangeSet<Comparable<?>>> {
17+
public class RangeSetDeserializer
18+
extends JsonDeserializer<RangeSet<Comparable<?>>>
19+
implements ContextualDeserializer
20+
{
1721
private JavaType genericRangeListType;
1822

1923
@Override

guava/src/main/java/com/fasterxml/jackson/datatype/guava/ser/RangeSetSerializer.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,17 @@
55
import com.fasterxml.jackson.databind.JavaType;
66
import com.fasterxml.jackson.databind.JsonSerializer;
77
import com.fasterxml.jackson.databind.SerializerProvider;
8+
import com.fasterxml.jackson.databind.ser.ContextualSerializer;
89
import com.google.common.collect.Range;
910
import com.google.common.collect.RangeSet;
1011

1112
import java.io.IOException;
1213
import java.util.List;
1314

14-
public class RangeSetSerializer extends JsonSerializer<RangeSet<Comparable<?>>> {
15+
public class RangeSetSerializer
16+
extends JsonSerializer<RangeSet<Comparable<?>>>
17+
implements ContextualSerializer
18+
{
1519
private JavaType genericRangeListType;
1620

1721
@Override

release-notes/CREDITS-2.x

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,10 @@ Jonas Konrad (Eclipse collections)
5959
* Contributed #29: Add eclipse-collections support
6060
(2.9.6)
6161

62+
Felix König (Felk@github)
63+
* Contributed #50: (guava) Add Serializer and Deserializer for `RangeSet`
64+
(2.10.0)
65+
6266
Jon Freedman (jonfreedman@github)
6367
* Reported #53: (guava) `GuavaImmutableCollectionDeserializer` cannot deserialize
6468
an empty `Optional` from null

release-notes/VERSION-2.x

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,11 @@ Modules:
1111

1212
2.10.0.pr3 (17-Sep-2019)
1313

14-
#56: Range property name (de)serialisation doesn't respect property naming strategy
14+
#50: (guava) Add Serializer and Deserializer for `RangeSet`
15+
(contributed by Felix K)
16+
#56: (guava) Range property name (de)serialisation doesn't respect property naming strategy
1517
(reported, fix contributed by Philip L)
16-
#59: Drop support for Guava v10 - v13 to simplify `RangeFactory`
18+
#59: (guava) Drop support for Guava v10 - v13 to simplify `RangeFactory`
1719

1820
2.10.0.pr2 (31-Aug-2019)
1921

0 commit comments

Comments
 (0)