Merge branch '2.13' into 2.14

Author: cowtowncoder

release-notes/VERSION-2.x

@@ -17,7 +17,12 @@ Project: jackson-databind
 
 2.13.3 (not yet released)
 
-...
+#3446: `java.lang.StringBuffer` cannot be deserialized
+ (reported by Lolf1010@github)
+
+2.13.2.2 (28-Mar-2022)
+
+No changes since 2.13.2.1 but fixed Gradle Module Metadata ("module.json")
 
 2.13.2.1 (24-Mar-2022)
 

src/main/java/com/fasterxml/jackson/databind/deser/std/FromStringDeserializer.java

@@ -74,6 +74,7 @@ public static Class<?>[] types() {
 
             // Special impl:
             StringBuilder.class,
+            StringBuffer.class, // since 2.13.3
         };
     }
 
@@ -120,6 +121,8 @@ public static FromStringDeserializer<?> findDeserializer(Class<?> rawType)
             kind = Std.STD_INET_SOCKET_ADDRESS;
         } else if (rawType == StringBuilder.class) {
             return new StringBuilderDeserializer();
+        } else if (rawType == StringBuffer.class) { // since 2.13.3
+            return new StringBufferDeserializer();
         } else {
             return null;
         }
@@ -465,9 +468,8 @@ private Locale _deSerializeBCP47Locale(String value, int ix, String first, Strin
             }
         }
     }
-
+   
     // @since 2.12 to simplify logic a bit: should not use coercions when reading
-    //   String Values
     static class StringBuilderDeserializer extends FromStringDeserializer<Object>
     {
         public StringBuilderDeserializer() {
@@ -503,4 +505,35 @@ protected Object _deserialize(String value, DeserializationContext ctxt)
             return new StringBuilder(value);
         }
     }
+
+    // @since 2.13.3: duplicated code but for only 2 impls base class seems unnecessary
+    static class StringBufferDeserializer extends FromStringDeserializer<Object>
+    {
+        public StringBufferDeserializer() { super(StringBuffer.class); }
+
+        @Override
+        public LogicalType logicalType() { return LogicalType.Textual; }
+
+        @Override
+        public Object getEmptyValue(DeserializationContext ctxt) {
+            return new StringBuffer();
+        }
+
+        @Override
+        public Object deserialize(JsonParser p, DeserializationContext ctxt) throws IOException
+        {
+            String text = p.getValueAsString();
+            if (text != null) {
+                return _deserialize(text, ctxt);
+            }
+            return super.deserialize(p, ctxt);
+        }
+
+        @Override
+        protected Object _deserialize(String value, DeserializationContext ctxt)
+            throws IOException
+        {
+            return new StringBuffer(value);
+        }
+    }
 }

src/test/java/com/fasterxml/jackson/databind/deser/jdk/JDKStringLikeTypeDeserTest.java

@@ -256,6 +256,12 @@ public void testStringBuilder() throws Exception
         assertEquals("abc", sb.toString());
     }
 
+    public void testStringBuffer() throws Exception
+    {
+        StringBuffer sb = MAPPER.readValue(q("abc"), StringBuffer.class);
+        assertEquals("abc", sb.toString());
+    }
+
     public void testURI() throws Exception
     {
         final ObjectReader reader = MAPPER.readerFor(URI.class);