Implement encoding in HttpURLConnectionBackend

softwaremill · Dec 27, 2024 · 7f839fc · 7f839fc
1 parent c7fb7d7
commit 7f839fc
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 6 deletions.
diff --git a/core/src/main/scala/sttp/client4/internal/compression/Compressor.scala b/core/src/main/scala/sttp/client4/internal/compression/Compressor.scala
@@ -85,6 +85,12 @@ private[client4] object DeflateDefaultCompressor extends Compressor {
 }
 
 private[client4] object Compressor {
+
+  /** Compress the request body if needed, using the given compressors.
+    * @return
+    *   The optionally compressed body (if requested via request options), or the original body; and the content lenght,
+    *   if known, of the uncompressed/compressed body.
+    */
   def compressIfNeeded[T, R](
       request: GenericRequest[T, R],
       compressors: List[Compressor]

diff --git a/core/src/main/scalajvm/sttp/client4/httpurlconnection/HttpURLConnectionBackend.scala b/core/src/main/scalajvm/sttp/client4/httpurlconnection/HttpURLConnectionBackend.scala
@@ -3,6 +3,7 @@ package sttp.client4.httpurlconnection
 import sttp.capabilities.Effect
 import sttp.client4.httpurlconnection.HttpURLConnectionBackend.EncodingHandler
 import sttp.client4.internal._
+import sttp.client4.internal.compression.{Compressor, DeflateDefaultCompressor, GZipDefaultCompressor}
 import sttp.client4.testing.SyncBackendStub
 import sttp.client4.ws.{GotAWebSocketException, NotAWebSocketException}
 import sttp.client4.{
@@ -37,6 +38,7 @@ import java.util.concurrent.ThreadLocalRandom
 import java.util.zip.{GZIPInputStream, InflaterInputStream}
 import scala.collection.JavaConverters._
 import scala.concurrent.duration.Duration
+import sttp.client4.GenericRequestBody
 
 class HttpURLConnectionBackend private (
     opts: BackendOptions,
@@ -47,11 +49,17 @@ class HttpURLConnectionBackend private (
 ) extends SyncBackend {
   type R = Any with Effect[Identity]
 
+  private val compressors: List[Compressor] = List(GZipDefaultCompressor, DeflateDefaultCompressor)
+
   override def send[T](r: GenericRequest[T, R]): Response[T] =
     adjustExceptions(r) {
+      val (body, contentLength) = Compressor.compressIfNeeded(r, compressors)
+
       val c = openConnection(r.uri)
       c.setRequestMethod(r.method.method)
-      r.headers.foreach(h => c.setRequestProperty(h.name, h.value))
+      // content-length might have changed due to compression
+      r.headers.foreach(h => if (!h.is(HeaderNames.ContentLength)) c.setRequestProperty(h.name, h.value))
+      contentLength.foreach(cl => c.setRequestProperty(HeaderNames.ContentLength, cl.toString))
       c.setDoInput(true)
       c.setReadTimeout(timeout(r.options.readTimeout))
       c.setConnectTimeout(timeout(opts.connectionTimeout))
@@ -66,7 +74,7 @@ class HttpURLConnectionBackend private (
         // we need to take care to:
         // (1) only call getOutputStream after the headers are set
         // (2) call it ony once
-        writeBody(r, c).foreach { os =>
+        writeBody(body, r, c).foreach { os =>
           os.flush()
           os.close()
         }
@@ -104,8 +112,12 @@ class HttpURLConnectionBackend private (
     conn.asInstanceOf[HttpURLConnection]
   }
 
-  private def writeBody(r: GenericRequest[_, R], c: HttpURLConnection): Option[OutputStream] =
-    r.body match {
+  private def writeBody(
+      body: GenericRequestBody[R],
+      r: GenericRequest[_, R],
+      c: HttpURLConnection
+  ): Option[OutputStream] =
+    body match {
       case NoBody =>
         // skip
         None
@@ -141,13 +153,13 @@ class HttpURLConnectionBackend private (
 
       case ByteBufferBody(b, _) =>
         val channel = Channels.newChannel(os)
-        channel.write(b)
+        val _ = channel.write(b)
 
       case InputStreamBody(b, _) =>
         transfer(b, os)
 
       case FileBody(f, _) =>
-        Files.copy(f.toPath, os)
+        val _ = Files.copy(f.toPath, os)
     }
 
   private val BoundaryChars =