Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[DON'T MERGE] Revert "Revert "clean: Replace scalaj with sttp (#496)" (#497)" #499

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

[DON'T MERGE] Revert "Revert "clean: Replace scalaj with sttp (#496)" (#497)" #499

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 18 additions & 16 deletions api-scala/src/main/scala/com/codacy/api/client/CodacyClient.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
package com.codacy.api.client

import play.api.libs.json._
import com.codacy.api.util.JsonOps
import scalaj.http.Http
import play.api.libs.json._
import sttp.client3.{HttpURLConnectionBackend, SttpBackendOptions}
import sttp.client3.quick._

import java.net.URL
import scala.util.{Failure, Success, Try}
import scala.concurrent.duration._
import scala.util.control.NonFatal
import scala.util.{Failure, Success, Try}

class CodacyClient(
apiUrl: Option[String] = None,
Expand Down Expand Up @@ -38,24 +40,24 @@ class CodacyClient(
sleepTime: Option[Int],
numRetries: Option[Int]
)(implicit reads: Reads[T]): RequestResponse[T] = {
val url = s"$remoteUrl/${request.endpoint}"
try {
val headers = tokens ++ Map("Content-Type" -> "application/json")
var req = quickRequest
.post(uri"$remoteUrl/${request.endpoint}".withParams(request.queryParameters))
.headers(tokens ++ Map("Content-Type" -> "application/json"))
.body(value)

var options = SttpBackendOptions.Default

val httpRequest = timeoutOpt match {
case Some(timeout) =>
Http(url).timeout(connTimeoutMs = timeout.connTimeoutMs, readTimeoutMs = timeout.readTimeoutMs)
case None => Http(url)
timeoutOpt.foreach { timeout =>
options = options.connectionTimeout(timeout.connTimeoutMs.millis)
req = req.readTimeout(timeout.readTimeoutMs.millis)
}

val body = httpRequest
.params(request.queryParameters)
.headers(headers)
.postData(value)
.asString
.body
val client = simpleHttpClient.withBackend(HttpURLConnectionBackend(options = options))

val response = client.send(req)

parseJsonAs[T](body) match {
parseJsonAs[T](response.body) match {
case failure: FailedResponse =>
retryPost(request, value, timeoutOpt, sleepTime, numRetries.map(x => x - 1), failure.message)
case success => success
Expand Down
2 changes: 1 addition & 1 deletion build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ lazy val apiScala = project
.settings(
libraryDependencies ++= Seq(
"com.typesafe.play" %% "play-json" % "2.8.2",
"org.scalaj" %% "scalaj-http" % "2.4.2",
"com.softwaremill.sttp.client3" %% "core" % "3.9.5",
"org.eclipse.jgit" % "org.eclipse.jgit" % "4.11.9.201909030838-r",
"org.scalatest" %% "scalatest" % "3.0.8" % Test
)
Expand Down