jackson: parse using a ByteBuffer (#23)

* jackson: parse using a ByteBuffer Update JacksonSupport.scala * Update JacksonSupport.scala
pjfanning · May 17, 2024 · a12e702 · a12e702
1 parent 15093fe
commit a12e702
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 59 deletions.
diff --git a/...-jackson/src/main/scala/com/github/pjfanning/pekkohttpjackson/ByteStringInputStream.scala b/...-jackson/src/main/scala/com/github/pjfanning/pekkohttpjackson/ByteStringInputStream.scala
diff --git a/pekko-http-jackson/src/main/scala/com/github/pjfanning/pekkohttpjackson/JacksonSupport.scala b/pekko-http-jackson/src/main/scala/com/github/pjfanning/pekkohttpjackson/JacksonSupport.scala
@@ -21,10 +21,12 @@ import com.fasterxml.jackson.core.util.{ BufferRecycler, JsonRecyclerPools, Recy
 import com.fasterxml.jackson.core.{
   JsonFactory,
   JsonFactoryBuilder,
+  JsonParser,
   StreamReadConstraints,
   StreamReadFeature,
   StreamWriteConstraints
 }
+import com.fasterxml.jackson.core.async.ByteBufferFeeder
 import com.fasterxml.jackson.databind.{ Module, ObjectMapper }
 import com.fasterxml.jackson.databind.json.JsonMapper
 import com.fasterxml.jackson.module.scala.{ ClassTagExtensions, JavaTypeable }
@@ -204,14 +206,19 @@ trait JacksonSupport {
   implicit def fromByteStringUnmarshaller[A: JavaTypeable](implicit
       objectMapper: ObjectMapper with ClassTagExtensions = defaultObjectMapper
   ): Unmarshaller[ByteString, A] =
-    if (ByteStringInputStream.byteStringSupportsAsInputStream) {
-      Unmarshaller { _ => bs =>
-        Future.fromTry(Try(objectMapper.readValue[A](ByteStringInputStream(bs))))
-      }
-    } else {
-      Unmarshaller { _ => bs =>
-        Future.fromTry(Try(objectMapper.readValue[A](bs.toArrayUnsafe())))
-      }
+    Unmarshaller { _ => bs =>
+      Future.fromTry(Try {
+        val parser = objectMapper.getFactory
+          .createNonBlockingByteBufferParser()
+          .asInstanceOf[JsonParser with ByteBufferFeeder]
+        bs match {
+          case bs: ByteString.ByteStrings =>
+            bs.asByteBuffers.foreach(parser.feedInput)
+          case bytes =>
+            parser.feedInput(bytes.asByteBuffer)
+        }
+        objectMapper.readValue[A](parser)
+      })
     }
 
   /**