Skip to content

Commit 3b95db3

Browse files
committed
Post-merge clean up for #136: update version, credits, move test to passing now
1 parent 968d981 commit 3b95db3

File tree

4 files changed

+17
-42
lines changed

4 files changed

+17
-42
lines changed

guava/src/test/java/com/fasterxml/jackson/datatype/guava/failing/OptionalUnwrappedTest.java

-39
This file was deleted.

guava/src/test/java/com/fasterxml/jackson/datatype/guava/optional/OptionalUnwrappedTest.java

+10
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,14 @@ public void testUntypedWithOptionalsNotNulls() throws Exception
3434
String jsonAct = mapper.writeValueAsString(new OptionalParent());
3535
assertEquals(jsonExp, jsonAct);
3636
}
37+
38+
// Test for "old" settings (2.5 and earlier only option; available on later too)
39+
// Fixed via [datatypes-collections#136]
40+
public void testUntypedWithNullEqOptionals() throws Exception
41+
{
42+
final ObjectMapper mapper = mapperWithModule(true);
43+
String jsonExp = aposToQuotes("{'XX.name':'Bob'}");
44+
String jsonAct = mapper.writeValueAsString(new OptionalParent());
45+
assertEquals(jsonExp, jsonAct);
46+
}
3747
}

release-notes/CREDITS-2.x

+3-1
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,9 @@ Wolff Bock von Wülfingen (@wlfbck)
119119
(2.16.0)
120120

121121
Muhammad Khalikov (@mukham12)
122-
* Contributed #118: Support @JsonFormat(shape=STRING) on Range<T>
122+
* Contributed #118: (guava) Support @JsonFormat(shape=STRING) on Range<T>
123+
(2.17.0)
124+
* Contributed #136: (guava) Fix for failing Guava `Optional` test
123125
(2.17.0)
124126

125127
Arthur Chan (@arthurscchan)

release-notes/VERSION-2.x

+4-2
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,13 @@ Active Maintainers:
1818

1919
2.17.0 (not yet released)
2020

21-
#118: Support @JsonFormat(shape=STRING) on Range<T>
21+
#118: (guava) Support @JsonFormat(shape=STRING) on Range<T>
2222
(contributed by Muhammad K)
23-
#124: Some deserializers throw unexpected `NullPointerException` when
23+
#124: (guava) Some deserializers throw unexpected `NullPointerException` when
2424
handling invalid input
2525
(contibuted by Arthur C)
26+
#136 (guava) Fix for failing Guava `Optional` test
27+
(contributed by Muhammad K)
2628

2729
2.16.0 (15-Nov-2023)
2830

0 commit comments

Comments
 (0)