From 3b95db319205321e4b49b3f74a8e6dadb9be1649 Mon Sep 17 00:00:00 2001
From: Tatu Saloranta <tatu.saloranta@iki.fi>
Date: Sun, 17 Dec 2023 18:24:30 -0800
Subject: [PATCH] Post-merge clean up for #136: update version, credits, move
 test to passing now

---
 .../guava/failing/OptionalUnwrappedTest.java  | 39 -------------------
 .../guava/optional/OptionalUnwrappedTest.java | 10 +++++
 release-notes/CREDITS-2.x                     |  4 +-
 release-notes/VERSION-2.x                     |  6 ++-
 4 files changed, 17 insertions(+), 42 deletions(-)
 delete mode 100644 guava/src/test/java/com/fasterxml/jackson/datatype/guava/failing/OptionalUnwrappedTest.java

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
deleted file mode 100644
index 827963a6..00000000
--- a/guava/src/test/java/com/fasterxml/jackson/datatype/guava/failing/OptionalUnwrappedTest.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.fasterxml.jackson.datatype.guava.failing;
-
-import com.fasterxml.jackson.annotation.*;
-import com.fasterxml.jackson.databind.*;
-
-import com.google.common.base.Optional;
-
-import com.fasterxml.jackson.datatype.guava.*;
-
-/**
- * Unit test for remaining part of #64.
- */
-public class OptionalUnwrappedTest extends ModuleTestBase
-{
-    static class Child {
-        public String name = "Bob";
-    }
-
-    static class Parent {
-        private Child child = new Child();
-
-        @JsonUnwrapped
-        public Child getChild() { return child; }
-    }
-
-    static class OptionalParent {
-        @JsonUnwrapped(prefix="XX.")
-        public Optional<Child> child = Optional.of(new Child());
-    }
-
-    // Test for "old" settings (2.5 and earlier only option; available on later too)
-    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/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
index af6db39a..18cb8126 100644
--- 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
index 92f0220a..fc9aa5d3 100644
--- 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
index 24b186a6..75e8c29d 100644
--- 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)