Merge branch '2.x' into 3.x

Author: cowtowncoder

guava/src/main/java/tools/jackson/datatype/guava/deser/GuavaCollectionDeserializer.java

@@ -134,9 +134,12 @@ public T deserialize(JsonParser p, DeserializationContext ctxt)
             return _deserializeContents(p, ctxt);
         }
         // But may support implicit arrays from single values?
-        if (ctxt.isEnabled(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY)) {
+        final boolean canWrap = (_unwrapSingle == Boolean.TRUE) ||
+                ((_unwrapSingle == null) && ctxt.isEnabled(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY));
+        if (canWrap) {
             return _deserializeFromSingleValue(p, ctxt);
         }
+        // Otherwise, we have a problem
         return (T) ctxt.handleUnexpectedToken(getValueType(ctxt), p);
     }
 

guava/src/test/java/tools/jackson/datatype/guava/ImmutableListAcceptSingle185Test.java

@@ -0,0 +1,59 @@
+package tools.jackson.datatype.guava;
+
+import java.util.List;
+
+import org.junit.jupiter.api.Test;
+
+import com.google.common.collect.ImmutableList;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import tools.jackson.databind.ObjectMapper;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+// [datatype-guava#185] : `GuavaCollectionDeserializer` does not respect
+// `JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY`
+public class ImmutableListAcceptSingle185Test
+    extends ModuleTestBase
+{
+    static class Line {
+        public String data;
+    }
+
+    static class GuavaContainer185 {
+        @JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
+        public ImmutableList<Line> lines;
+    }
+
+    static class JavaContainer185 {
+        @JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
+        public List<Line> lines;
+    }
+
+    private final ObjectMapper MAPPER = mapperWithModule();
+
+    // Sanity Check, JDK List works by default
+    @Test
+    public void testJDKListWithSingleValue()
+            throws Exception
+    {
+        String json = "{\"lines\":{\"data\":\"something-jdk\"}}";
+
+        JavaContainer185 javaContainer = MAPPER.readValue(json, JavaContainer185.class);
+        assertEquals(1, javaContainer.lines.size());
+        assertEquals("something-jdk", javaContainer.lines.get(0).data);
+    }
+
+    // Guava's ImmutableList does not work, but should
+    @Test
+    public void testGuavaImmutableListWithSingleValue()
+            throws Exception
+    {
+        String json = "{\"lines\":{\"data\":\"something-guava\"}}";
+
+        GuavaContainer185 container = MAPPER.readValue(json, GuavaContainer185.class);
+        assertEquals(1, container.lines.size());
+        assertEquals("something-guava", container.lines.get(0).data);
+    }
+}

release-notes/CREDITS-2.x

@@ -109,6 +109,8 @@ Joo Hyuk Kim (JooHyukKim@github)
  * Contributed fix for #117: (guava) `ImmutableRangeSet` fails to deserialize
    without explicit deserializer
   (2.16.0)
+ * Contributed fix for #185: `ACCEPT_SINGLE_VALUE_AS_ARRAY` doesn't work on Guava `ImmutableList`
+  (2.18.5)
 
 Ethan McCue (@bowbahdoe)
   * Reported #122: PCollections module info (`module-info.class`) incorrect
@@ -134,6 +136,10 @@ Arthur Chan (@arthurscchan)
     some circumstances
    (2.17.0)
 
+Gergely Juhasz (@JGergely)
+ * Reported #185: `ACCEPT_SINGLE_VALUE_AS_ARRAY` doesn't work on Guava `ImmutableList`
+  (2.18.5)
+
 Abhishek Kumar (@Abhishekkr3003)
   * Contributed #1: (guava) Add deserialization support for `Table<R, C, V>`
    (2.19.0)

release-notes/VERSION-2.x

@@ -21,13 +21,25 @@ Active Maintainers:
 #190: Add unit tests to verify goodness of SPI metadata for Modules
 - Generate SBOMs [JSTEP-14]
 
+2.19.1 (not yet released)
+
+#185: `ACCEPT_SINGLE_VALUE_AS_ARRAY` doesn't work on Guava `ImmutableList`
+ (reported by Gergely J)
+ (fix contributed by Joo-Hyuk K)
+
 2.19.0 (24-Apr-2025)
 
 #1: (guava) Add deserialization support for `Table<R, C, V>`
  (contributed by Abhishek K)
 #174: Unify testing structure/tools [JSTEP-10]
  (contributed by Joo-Hyuk K)
 
+2.18.5 (not yet released)
+
+#185: `ACCEPT_SINGLE_VALUE_AS_ARRAY` doesn't work on Guava `ImmutableList`
+ (reported by Gergely J)
+ (fix contributed by Joo-Hyuk K)
+
 2.18.4 (06-May-2025)
 2.18.3 (28-Feb-2025)
 2.18.2 (27-Nov-2024)