Skip to content
This repository was archived by the owner on Mar 28, 2025. It is now read-only.

Commit 6032a64

Browse files
committed
* Fix multiline strings review note.
* Fix not used method parameters review note.
1 parent e0ac15d commit 6032a64

File tree

2 files changed

+14
-6
lines changed

2 files changed

+14
-6
lines changed

testApi/src/main/scala/africa/absa/testing/scapi/rest/request/sender/ScAPIRequestSender.scala

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import java.net.HttpCookie
2626
*/
2727
object ScAPIRequestSender extends RequestSender {
2828

29-
private def sendRequest(requestFunc: => requests.Response, url: String, headers: Map[String, String], verifySslCerts: Boolean, data: String, params: Map[String, String]): Response = {
29+
private def sendRequest(requestFunc: => requests.Response): Response = {
3030
val startTime = System.nanoTime()
3131
val response = requestFunc
3232
val endTime = System.nanoTime()
@@ -58,7 +58,7 @@ object ScAPIRequestSender extends RequestSender {
5858
* @return Response Returns the response from the GET request.
5959
*/
6060
override def get(url: String, headers: Map[String, String], verifySslCerts: Boolean, data: String, params: Map[String, String]): Response = {
61-
sendRequest(requests.get(url = url, headers = headers, verifySslCerts = verifySslCerts, data = data, params = params), url, headers, verifySslCerts, data, params)
61+
sendRequest(requests.get(url = url, headers = headers, verifySslCerts = verifySslCerts, data = data, params = params))
6262
}
6363

6464
/**
@@ -72,7 +72,7 @@ object ScAPIRequestSender extends RequestSender {
7272
* @return Response Returns the response from the POST request.
7373
*/
7474
override def post(url: String, headers: Map[String, String], verifySslCerts: Boolean, data: String, params: Map[String, String]): Response = {
75-
sendRequest(requests.post(url = url, headers = headers, verifySslCerts = verifySslCerts, data = data, params = params), url, headers, verifySslCerts, data, params)
75+
sendRequest(requests.post(url = url, headers = headers, verifySslCerts = verifySslCerts, data = data, params = params))
7676
}
7777

7878
/**
@@ -86,7 +86,7 @@ object ScAPIRequestSender extends RequestSender {
8686
* @return Response Returns the response from the PUT request.
8787
*/
8888
override def put(url: String, headers: Map[String, String], verifySslCerts: Boolean, data: String, params: Map[String, String]): Response = {
89-
sendRequest(requests.put(url = url, headers = headers, verifySslCerts = verifySslCerts, data = data, params = params), url, headers, verifySslCerts, data, params)
89+
sendRequest(requests.put(url = url, headers = headers, verifySslCerts = verifySslCerts, data = data, params = params))
9090
}
9191

9292
/**
@@ -100,6 +100,6 @@ object ScAPIRequestSender extends RequestSender {
100100
* @return Response Returns the response from the DELETE request.
101101
*/
102102
override def delete(url: String, headers: Map[String, String], verifySslCerts: Boolean, data: String, params: Map[String, String]): Response = {
103-
sendRequest(requests.delete(url = url, headers = headers, verifySslCerts = verifySslCerts, data = data, params = params), url, headers, verifySslCerts, data, params)
103+
sendRequest(requests.delete(url = url, headers = headers, verifySslCerts = verifySslCerts, data = data, params = params))
104104
}
105105
}

testApi/src/main/scala/africa/absa/testing/scapi/rest/response/Response.scala

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,15 @@ object Response {
6060
def perform(response: Response, responseAction: Seq[ResponseAction]): Boolean = {
6161
def logParameters(response: Response, resolvedResponseAction: ResponseAction, exception: Option[Throwable] = None): Unit = {
6262
val filteredParams = resolvedResponseAction.params.filter(_._1 != "method").map { case (k, v) => s"$k->$v" }.mkString(", ")
63-
val baseLog = s"\nParameters received: \n\tRequired Response-Action: \n\t\tGroup->'${resolvedResponseAction.group}', \n\t\tMethod->'${resolvedResponseAction.name}', \n\t\tParams->'${filteredParams}', \n\tActual Response: \n\t\t$response"
63+
val baseLog =
64+
s"""
65+
|Parameters received:
66+
| Required Response-Action:
67+
| Group->'${resolvedResponseAction.group}',
68+
| Method->'${resolvedResponseAction.name}',
69+
| Params->'${filteredParams}',
70+
| Actual Response:
71+
| $response""".stripMargin
6472
val exceptionLog = exception.map(e => s"\nException: ${e.getMessage}").getOrElse("")
6573
Logger.debug(s"Response-${resolvedResponseAction.group}: '${resolvedResponseAction.name}' - error details:$baseLog$exceptionLog")
6674
}

0 commit comments

Comments
 (0)