Post-merge clean up for #136: update version, credits, move test to p…

…assing now
FasterXML · Dec 18, 2023 · 3b95db3 · 3b95db3
1 parent 968d981
commit 3b95db3
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 42 deletions.
diff --git a/guava/src/test/java/com/fasterxml/jackson/datatype/guava/failing/OptionalUnwrappedTest.java b/guava/src/test/java/com/fasterxml/jackson/datatype/guava/failing/OptionalUnwrappedTest.java
diff --git a/guava/src/test/java/com/fasterxml/jackson/datatype/guava/optional/OptionalUnwrappedTest.java b/guava/src/test/java/com/fasterxml/jackson/datatype/guava/optional/OptionalUnwrappedTest.java
@@ -34,4 +34,14 @@ public void testUntypedWithOptionalsNotNulls() throws Exception
         String jsonAct = mapper.writeValueAsString(new OptionalParent());
         assertEquals(jsonExp, jsonAct);
     }
+
+    // Test for "old" settings (2.5 and earlier only option; available on later too)
+    // Fixed via [datatypes-collections#136]
+    public void testUntypedWithNullEqOptionals() throws Exception
+    {
+        final ObjectMapper mapper = mapperWithModule(true);
+        String jsonExp = aposToQuotes("{'XX.name':'Bob'}");
+        String jsonAct = mapper.writeValueAsString(new OptionalParent());
+        assertEquals(jsonExp, jsonAct);
+    }
 }
diff --git a/release-notes/CREDITS-2.x b/release-notes/CREDITS-2.x
@@ -119,7 +119,9 @@ Wolff Bock von Wülfingen (@wlfbck)
    (2.16.0)
 
 Muhammad Khalikov (@mukham12)
-  * Contributed #118: Support @JsonFormat(shape=STRING) on Range<T>
+  * Contributed #118: (guava) Support @JsonFormat(shape=STRING) on Range<T>
+   (2.17.0)
+  * Contributed #136: (guava) Fix for failing Guava `Optional` test
    (2.17.0)
 
 Arthur Chan (@arthurscchan)

diff --git a/release-notes/VERSION-2.x b/release-notes/VERSION-2.x
@@ -18,11 +18,13 @@ Active Maintainers:
 
 2.17.0 (not yet released)
 
-#118: Support @JsonFormat(shape=STRING) on Range<T>
+#118: (guava) Support @JsonFormat(shape=STRING) on Range<T>
  (contributed by Muhammad K)
-#124: Some deserializers throw unexpected `NullPointerException` when
+#124: (guava) Some deserializers throw unexpected `NullPointerException` when
   handling invalid input
  (contibuted by Arthur C)
+#136 (guava) Fix for failing Guava `Optional` test
+ (contributed by Muhammad K)
 
 2.16.0 (15-Nov-2023)