Skip to content

Commit 399cb3f

Browse files
authored
Revert "clean: Replace scalaj with sttp (#496)" (#497)
This reverts commit 9cc735f.
1 parent 04b2c80 commit 399cb3f

File tree

2 files changed

+17
-19
lines changed

2 files changed

+17
-19
lines changed

api-scala/src/main/scala/com/codacy/api/client/CodacyClient.scala

+16-18
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
package com.codacy.api.client
22

3-
import com.codacy.api.util.JsonOps
43
import play.api.libs.json._
5-
import sttp.client3.{HttpURLConnectionBackend, SttpBackendOptions}
6-
import sttp.client3.quick._
4+
import com.codacy.api.util.JsonOps
5+
import scalaj.http.Http
76

87
import java.net.URL
9-
import scala.concurrent.duration._
10-
import scala.util.control.NonFatal
118
import scala.util.{Failure, Success, Try}
9+
import scala.util.control.NonFatal
1210

1311
class CodacyClient(
1412
apiUrl: Option[String] = None,
@@ -40,24 +38,24 @@ class CodacyClient(
4038
sleepTime: Option[Int],
4139
numRetries: Option[Int]
4240
)(implicit reads: Reads[T]): RequestResponse[T] = {
41+
val url = s"$remoteUrl/${request.endpoint}"
4342
try {
44-
var req = quickRequest
45-
.post(uri"$remoteUrl/${request.endpoint}".withParams(request.queryParameters))
46-
.headers(tokens ++ Map("Content-Type" -> "application/json"))
47-
.body(value)
48-
49-
var options = SttpBackendOptions.Default
43+
val headers = tokens ++ Map("Content-Type" -> "application/json")
5044

51-
timeoutOpt.foreach { timeout =>
52-
options = options.connectionTimeout(timeout.connTimeoutMs.millis)
53-
req = req.readTimeout(timeout.readTimeoutMs.millis)
45+
val httpRequest = timeoutOpt match {
46+
case Some(timeout) =>
47+
Http(url).timeout(connTimeoutMs = timeout.connTimeoutMs, readTimeoutMs = timeout.readTimeoutMs)
48+
case None => Http(url)
5449
}
5550

56-
val client = simpleHttpClient.withBackend(HttpURLConnectionBackend(options = options))
57-
58-
val response = client.send(req)
51+
val body = httpRequest
52+
.params(request.queryParameters)
53+
.headers(headers)
54+
.postData(value)
55+
.asString
56+
.body
5957

60-
parseJsonAs[T](response.body) match {
58+
parseJsonAs[T](body) match {
6159
case failure: FailedResponse =>
6260
retryPost(request, value, timeoutOpt, sleepTime, numRetries.map(x => x - 1), failure.message)
6361
case success => success

build.sbt

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ lazy val apiScala = project
7777
.settings(
7878
libraryDependencies ++= Seq(
7979
"com.typesafe.play" %% "play-json" % "2.8.2",
80-
"com.softwaremill.sttp.client3" %% "core" % "3.9.5",
80+
"org.scalaj" %% "scalaj-http" % "2.4.2",
8181
"org.eclipse.jgit" % "org.eclipse.jgit" % "4.11.9.201909030838-r",
8282
"org.scalatest" %% "scalatest" % "3.0.8" % Test
8383
)

0 commit comments

Comments
 (0)