Backport #50 in 2.10, update release notes

FasterXML · Sep 19, 2019 · c233b02 · c233b02
1 parent b0b2186
commit c233b02
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 4 deletions.
diff --git a/guava/src/main/java/com/fasterxml/jackson/datatype/guava/deser/RangeSetDeserializer.java b/guava/src/main/java/com/fasterxml/jackson/datatype/guava/deser/RangeSetDeserializer.java
@@ -6,14 +6,18 @@
 import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.JsonDeserializer;
+import com.fasterxml.jackson.databind.deser.ContextualDeserializer;
 import com.google.common.collect.ImmutableRangeSet;
 import com.google.common.collect.Range;
 import com.google.common.collect.RangeSet;
 
 import java.io.IOException;
 import java.util.List;
 
-public class RangeSetDeserializer extends JsonDeserializer<RangeSet<Comparable<?>>> {
+public class RangeSetDeserializer
+    extends JsonDeserializer<RangeSet<Comparable<?>>>
+    implements ContextualDeserializer
+{
     private JavaType genericRangeListType;
 
     @Override

diff --git a/guava/src/main/java/com/fasterxml/jackson/datatype/guava/ser/RangeSetSerializer.java b/guava/src/main/java/com/fasterxml/jackson/datatype/guava/ser/RangeSetSerializer.java
@@ -5,13 +5,17 @@
 import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.JsonSerializer;
 import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.ser.ContextualSerializer;
 import com.google.common.collect.Range;
 import com.google.common.collect.RangeSet;
 
 import java.io.IOException;
 import java.util.List;
 
-public class RangeSetSerializer extends JsonSerializer<RangeSet<Comparable<?>>> {
+public class RangeSetSerializer
+    extends JsonSerializer<RangeSet<Comparable<?>>>
+    implements ContextualSerializer
+{
     private JavaType genericRangeListType;
 
     @Override

diff --git a/release-notes/CREDITS-2.x b/release-notes/CREDITS-2.x
@@ -59,6 +59,10 @@ Jonas Konrad (Eclipse collections)
   * Contributed #29: Add eclipse-collections support
    (2.9.6)
 
+Felix König (Felk@github)
+  * Contributed #50: (guava) Add Serializer and Deserializer for `RangeSet`
+   (2.10.0)
+
 Jon Freedman (jonfreedman@github)
   * Reported #53: (guava) `GuavaImmutableCollectionDeserializer` cannot deserialize
    an empty `Optional` from null

diff --git a/release-notes/VERSION-2.x b/release-notes/VERSION-2.x
@@ -11,9 +11,11 @@ Modules:
 
 2.10.0.pr3 (17-Sep-2019)
 
-#56: Range property name (de)serialisation doesn't respect property naming strategy
+#50: (guava) Add Serializer and Deserializer for `RangeSet`
+ (contributed by Felix K)
+#56: (guava) Range property name (de)serialisation doesn't respect property naming strategy
  (reported, fix contributed by Philip L)
-#59: Drop support for Guava v10 - v13 to simplify `RangeFactory`
+#59: (guava) Drop support for Guava v10 - v13 to simplify `RangeFactory`
 
 2.10.0.pr2 (31-Aug-2019)