Merge pull request #240 from maiflai/ahc3

Ahc3
dispatch · Aug 17, 2024 · 4e69a1b · 4e69a1b
2 parents 658a1ba + 6635601
commit 4e69a1b
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 222 deletions.
diff --git a/core/build.sbt b/core/build.sbt
@@ -4,7 +4,7 @@ description :=
   "Core Dispatch module wrapping async-http-client"
 
 libraryDependencies +=
-  "org.asynchttpclient" % "async-http-client" % "2.10.4"
+  "org.asynchttpclient" % "async-http-client" % "3.0.0"
 
 enablePlugins(BuildInfoPlugin)
 

diff --git a/core/src/main/scala/as/oauth/token.scala b/core/src/main/scala/as/oauth/token.scala
diff --git a/core/src/main/scala/defaults.scala b/core/src/main/scala/defaults.scala
@@ -4,6 +4,8 @@ import io.netty.util.{HashedWheelTimer, Timer}
 import org.asynchttpclient.DefaultAsyncHttpClientConfig.Builder
 import org.asynchttpclient._
 
+import java.time.Duration
+
 object Defaults {
   implicit def executor = scala.concurrent.ExecutionContext.Implicits.global
 
@@ -26,9 +28,11 @@ private[dispatch] object InternalDefaults {
   private object BasicDefaults extends Defaults {
     lazy val timer = new HashedWheelTimer()
 
+    private val userAgent = "Dispatch/%s" format BuildInfo.version
+    private val infinite = Duration.ofMillis(-1)
     def builder: Builder = new DefaultAsyncHttpClientConfig.Builder()
-      .setUserAgent("Dispatch/%s" format BuildInfo.version)
-      .setRequestTimeout(-1) // don't timeout streaming connections
+      .setUserAgent(userAgent)
+      .setRequestTimeout(infinite) // don't timeout streaming connections
       .setUseProxyProperties(true)
   }
 

diff --git a/core/src/main/scala/oauth/exchange.scala b/core/src/main/scala/oauth/exchange.scala
diff --git a/core/src/main/scala/oauth/package.scala b/core/src/main/scala/oauth/package.scala
diff --git a/core/src/main/scala/oauth/requests.scala b/core/src/main/scala/oauth/requests.scala
diff --git a/core/src/test/scala/oauth/exchange.scala b/core/src/test/scala/oauth/exchange.scala