convert httpoptions to seq

Author: hjrocha

cli/src/test/scala/com/codacy/analysis/cli/configuration/CLIConfigurationSpec.scala

@@ -51,7 +51,7 @@ class CLIConfigurationSpec extends Specification with NoLanguageFeatures {
     commitUuid = commitUuid,
     extras = ExtraOptions(analyser = Analyser.defaultAnalyser.name))
   private val defaultEnvironment = new Environment(Map.empty)
-  private val httpHelper = new HttpHelper(remoteUrl, Map.empty)
+  private val httpHelper = new HttpHelper(remoteUrl, Map.empty, false)
 
   private val noRemoteConfigCodacyClient =
     new CodacyClient(apiCredentials, httpHelper)(ExecutionContext.global) {

core/src/main/scala/com/codacy/analysis/core/utils/HttpHelper.scala

@@ -4,25 +4,24 @@ import io.circe.parser.parse
 import io.circe.{Json, ParsingFailure}
 import scalaj.http.{Http, HttpRequest, HttpResponse, HttpOptions}
 
-class HttpHelper(apiUrl: String, extraHeaders: Map[String, String], allowUnsafeSSL: Boolean = false) {
+class HttpHelper(apiUrl: String, extraHeaders: Map[String, String], allowUnsafeSSL: Boolean) {
 
   private lazy val connectionTimeoutMs = 2000
   private lazy val readTimeoutMs = 5000
 
   private val remoteUrl = apiUrl + "/2.0"
 
+  private def httpOptions = if (allowUnsafeSSL) Seq(HttpOptions.allowUnsafeSSL) else Seq.empty
+
   def get(endpoint: String): Either[ParsingFailure, Json] = {
     val headers: Map[String, String] = Map("Content-Type" -> "application/json") ++ extraHeaders
 
     val response: HttpResponse[String] =
-      if (allowUnsafeSSL)
-        Http(s"$remoteUrl$endpoint")
-          .headers(headers)
-          .timeout(connectionTimeoutMs, readTimeoutMs)
-          .options(HttpOptions.allowUnsafeSSL)
-          .asString
-      else
-        Http(s"$remoteUrl$endpoint").headers(headers).timeout(connectionTimeoutMs, readTimeoutMs).asString
+      Http(s"$remoteUrl$endpoint")
+        .headers(headers)
+        .timeout(connectionTimeoutMs, readTimeoutMs)
+        .options(httpOptions)
+        .asString
 
     parse(response.body)
 
@@ -34,11 +33,7 @@ class HttpHelper(apiUrl: String, extraHeaders: Map[String, String], allowUnsafeS
     } ++ extraHeaders
 
     val request: HttpRequest = dataOpt.map { data =>
-      if (allowUnsafeSSL) {
-        Http(s"$remoteUrl$endpoint").options(HttpOptions.allowUnsafeSSL).postData(data.toString)
-      } else {
-        Http(s"$remoteUrl$endpoint").postData(data.toString)
-      }
+      Http(s"$remoteUrl$endpoint").options(httpOptions).postData(data.toString)
 
     }.getOrElse(Http(s"$remoteUrl$endpoint"))
       .method("POST")