* Fix - review of code warnings.

* Fix - update of visibility on methods and attributes.
* Fix - removed old no more used object LoggerConfig.

Author: miroslavpojer

testApi/src/main/scala/africa/absa/testing/scapi/config/ScAPIRunnerConfig.scala

@@ -115,23 +115,23 @@ object ScAPIRunnerConfig {
     opt[String]("filter")
       .optional()
       .action((value, config) => { config.copy(filter = value) })
-      .text(s"Filter rule to select test definitions file (recursive) to include into test suite. Default is all '${DefaultFilter}'")
+      .text(s"Filter rule to select test definitions file (recursive) to include into test suite. Default is all '$DefaultFilter'")
 
     opt[Seq[String]]("categories")
       .optional()
       .valueName("<v1>,<v2>")
       .action((value, config) => { config.copy(categories = value.toSet) })
-      .text(s"Select which test categories will be included into test suite. Default is all '${DefaultCategories}'")
+      .text(s"Select which test categories will be included into test suite. Default is all '$DefaultCategories'")
 
     opt[Int]("thread-count")
       .optional()
       .action((value, config) => { config.copy(threadCount = value) })
-      .text(s"Maximum count of thread used to run test suite. Default is '${DefaultThreadCount}'")
+      .text(s"Maximum count of thread used to run test suite. Default is '$DefaultThreadCount'")
 
     opt[String]("file-format")
       .optional()
       .action((value, config) => { config.copy(fileFormat = value) })
-      .text(s"Format of definition files. Default is all '${DefaultFileFormat}'")
+      .text(s"Format of definition files. Default is all '$DefaultFileFormat'")
 
     opt[String]("report")
       .optional()

testApi/src/main/scala/africa/absa/testing/scapi/json/SuiteFactory.scala

@@ -127,7 +127,7 @@ object SuiteFactory {
    * @param environmentMap The map containing environment variables.
    * @return A SuiteBundle instance.
    */
-  def loadJsonSuiteBundle(suitePath: String, environmentMap: Map[String, String]): SuiteBundle = {
+  private def loadJsonSuiteBundle(suitePath: String, environmentMap: Map[String, String]): SuiteBundle = {
     val (suiteFilePath, suiteFileName) = FileUtils.splitPathAndFileName(suitePath)
     val suiteName = suiteFileName.stripSuffix(".suite.json")
 
@@ -189,7 +189,8 @@ object SuiteFactory {
    * @param extension     The file extension.
    * @param parser        The parser function used to parse JSON string.
    * @return A Suite instance.
-   */  def loadJsonSuite[T <: SuiteAround](suiteFilePath: String,
+   */
+  private def loadJsonSuite[T <: SuiteAround](suiteFilePath: String,
                                       suiteName: String,
                                       properties: Map[String, String],
                                       jsonSchema: URL,
@@ -212,7 +213,7 @@ object SuiteFactory {
    * @param jsonString The JSON string to be parsed.
    * @return A SuiteConstants instance.
    */
-  def parseToSuiteConstant(jsonString: String): SuiteConstants = {
+  private def parseToSuiteConstant(jsonString: String): SuiteConstants = {
     import SuiteConstantJsonProtocol.suiteConstantFormat
     jsonString.parseJson.convertTo[SuiteConstants]
   }
@@ -223,7 +224,7 @@ object SuiteFactory {
    * @param jsonString The JSON string to be parsed.
    * @return A SuiteBefore instance.
    */
-  def parseToSuiteBefore(jsonString: String): SuiteBefore = {
+  private def parseToSuiteBefore(jsonString: String): SuiteBefore = {
     import SuiteBeforeJsonProtocol.suiteBeforeFormat
     jsonString.parseJson.convertTo[SuiteBefore]
   }
@@ -234,7 +235,7 @@ object SuiteFactory {
    * @param jsonString The JSON string to be parsed.
    * @return A SuiteAfter instance.
    */
-  def parseToSuiteAfter(jsonString: String): SuiteAfter = {
+  private def parseToSuiteAfter(jsonString: String): SuiteAfter = {
     import SuiteAfterJsonProtocol.suiteAfterFormat
     jsonString.parseJson.convertTo[SuiteAfter]
   }
@@ -245,7 +246,7 @@ object SuiteFactory {
    * @param jsonString The JSON string to be parsed.
    * @return A Suite instance.
    */
-  def parseToSuite(jsonString: String): Suite = {
+  private def parseToSuite(jsonString: String): Suite = {
     import SuiteJsonProtocol.suiteFormat
     jsonString.parseJson.convertTo[Suite]
   }
@@ -333,7 +334,7 @@ object ResponseActionJsonProtocol extends DefaultJsonProtocol {
 
       val paramFields = a.params.view.mapValues(JsString(_)).toSeq
 
-      JsObject((fixedFields ++ paramFields): _*)
+      JsObject(fixedFields ++ paramFields: _*)
     }
 
     def read(value: JsValue): ResponseAction = {

testApi/src/main/scala/africa/absa/testing/scapi/json/schema/JsonSchemaValidator.scala

@@ -31,28 +31,28 @@ import java.net.URL
  * @param schemaPath Path to the JSON Schema file.
  */
 case class JsonSchemaValidator(jsonPath: String, schemaPath: URL) {
-  protected val mapper: ObjectMapper = new ObjectMapper()
+  private val mapper: ObjectMapper = new ObjectMapper()
 
   /**
    * Method to read JSON data from the specified file path.
    *
    * @return JsonNode object representing the JSON data.
    */
-  def jsonNode: JsonNode = mapper.readTree(JsonUtils.stringFromPath(jsonPath))
+  private def jsonNode: JsonNode = mapper.readTree(JsonUtils.stringFromPath(jsonPath))
 
   /**
    * Method to create a JsonSchemaFactory instance.
    *
    * @return JsonSchemaFactory instance.
    */
-  def jsonSchemaFactory: JsonSchemaFactory = JsonSchemaFactory.getInstance(SpecVersion.VersionFlag.V202012)
+  private def jsonSchemaFactory: JsonSchemaFactory = JsonSchemaFactory.getInstance(SpecVersion.VersionFlag.V202012)
 
   /**
    * Method to generate a JsonSchema from the provided schema file path.
    *
    * @return JsonSchema object representing the JSON schema.
    */
-  def jsonSchema: JsonSchema = jsonSchemaFactory.getSchema(JsonUtils.stringFromPath(schemaPath))
+  private def jsonSchema: JsonSchema = jsonSchemaFactory.getSchema(JsonUtils.stringFromPath(schemaPath))
 
   /**
    * Method to validate the JSON data against the provided schema.

testApi/src/main/scala/africa/absa/testing/scapi/logging/LoggerConfig.scala

@@ -73,7 +73,7 @@ object Response {
            |  Required Response-Action:
            |    Group->'${resolvedResponseAction.group}',
            |    Method->'${resolvedResponseAction.name}',
-           |    Params->'${filteredParams}',
+           |    Params->'$filteredParams',
            |  Actual Response:
            |    $response""".stripMargin
       val exceptionLog = exception.map(e => s"\nException: ${e.getMessage}").getOrElse("")

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

@@ -45,7 +45,7 @@ object LogResponseAction extends ResponsePerformer {
           case Some(message) => ContentValidator.validateNonEmptyString(message, s"ResponseLog.${responseAction.name}.message")
           case None => throw new IllegalArgumentException(s"Missing required 'message' for assertion ${responseAction.name} logic.")
         }
-      case _ => throw UndefinedResponseActionTypeException(responseAction.name.toString)
+      case _ => throw UndefinedResponseActionTypeException(responseAction.name)
     }
   }
 

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

@@ -31,7 +31,7 @@ import scala.util.{Failure, Try}
  * Main object handling the running of test suites.
  */
 object SuiteRunner {
-  type RestClientCreator = () => RestClient
+  private type RestClientCreator = () => RestClient
 
   /**
    * Run a set of test suites.
@@ -86,16 +86,11 @@ object SuiteRunner {
    * @return SuiteResults after the execution of the suite-before method.
    */
   private def runSuiteBefore(suiteEndpoint: String, suiteBeforeName: String, method: Method, environment: Environment, restClientCreator: RestClientCreator): SuiteResult = {
-    Logger.debug(s"Suite-Before: ${suiteBeforeName} - Started")
+    Logger.debug(s"Suite-Before: $suiteBeforeName - Started")
     val testStartTime: Long = System.currentTimeMillis()
 
     try {
-      val response: Response = sendRequest(method, environment, restClientCreator)
-      val result: Try[Unit] = Response.perform(
-        response = response,
-        responseAction = method.responseActions
-      )
-
+      val result: Try[Unit] = processRequest(method, environment, restClientCreator)
       val testEndTime: Long = System.currentTimeMillis()
       Logger.debug(s"Suite-Before: method '${method.name}' - ${if (result.isSuccess) "completed successfully" else "failed"}.")
       SuiteResult(
@@ -123,12 +118,7 @@ object SuiteRunner {
     val testStartTime: Long = System.currentTimeMillis()
 
     try {
-      val response: Response = sendRequest(test, environment, restClientCreator)
-      val result: Try[Unit] = Response.perform(
-        response = response,
-        responseAction = test.responseActions
-      )
-
+      val result: Try[Unit] = processRequest(test, environment, restClientCreator)
       val testEndTime: Long = System.currentTimeMillis()
       Logger.debug(s"Suite-Test: '${test.name}' - ${if (result.isSuccess) "completed successfully" else "failed"}.")
       SuiteResult(
@@ -157,16 +147,11 @@ object SuiteRunner {
    * @return SuiteResults after the execution of the suite-after method.
    */
   private def runSuiteAfter(suiteEndpoint: String, suiteAfterName: String, method: Method, environment: Environment, restClientCreator: RestClientCreator): SuiteResult = {
-    Logger.debug(s"Suite-After: ${suiteAfterName} - Started")
+    Logger.debug(s"Suite-After: $suiteAfterName - Started")
     val testStartTime: Long = System.currentTimeMillis()
 
     try {
-      val response: Response = sendRequest(method, environment, restClientCreator)
-      val result: Try[Unit] = Response.perform(
-        response = response,
-        responseAction = method.responseActions
-      )
-
+      val result: Try[Unit] = processRequest(method, environment, restClientCreator)
       val testEndTime: Long = System.currentTimeMillis()
       Logger.debug(s"After method '${method.name}' ${if (result.isSuccess) "completed successfully" else "failed"}.")
       SuiteResult(
@@ -199,6 +184,23 @@ object SuiteRunner {
     )
   }
 
+  /**
+   * Process the request and perform the associated response actions.
+   *
+   * @param requestable       The request-able method containing the actions and response actions.
+   * @param environment       The current environment.
+   * @param restClientCreator A creator function for the REST client.
+   * @return A Try containing the result of the response actions.
+   */
+  private def processRequest(requestable: Requestable, environment: Environment, restClientCreator: RestClientCreator): Try[Unit] = {
+    val response: Response = sendRequest(requestable, environment, restClientCreator)
+    val result: Try[Unit] = Response.perform(
+      response = response,
+      responseAction = requestable.responseActions
+    )
+    result
+  }
+
   /**
    * Handles exceptions occurring during suite running.
    *
@@ -212,7 +214,7 @@ object SuiteRunner {
   private def handleException(e: Throwable, suiteEndpoint: String, name: String, testStartTime: Long, resultType: String, categories: Option[String] = None): SuiteResult = {
     val testEndTime = System.currentTimeMillis()
     val message = e match {
-      case _ => s"Request exception occurred while running suite: ${suiteEndpoint}, ${resultType}: ${name}. Exception: ${e.getMessage}"
+      case _ => s"Request exception occurred while running suite: $suiteEndpoint, $resultType: $name. Exception: ${e.getMessage}"
     }
     Logger.error(message)
     resultType match {

testApi/src/main/scala/africa/absa/testing/scapi/suite/runner/SuiteRunner.scala

@@ -130,10 +130,9 @@ object RuntimeCache {
       case "global" => GlobalLevel
       case "suite" => SuiteLevel
       case "test" => TestLevel
-      case _ => {
+      case _ =>
         Logger.warn(s"Not known expiration cache level: '$level'. Used default TEST level.")
         TestLevel
-      }
     }
   }
 

testApi/src/main/scala/africa/absa/testing/scapi/utils/cache/RuntimeCache.scala

@@ -72,7 +72,7 @@ object ContentValidator {
   def validateNotNone(input: Option[String], paramName: String): Unit = {
     input match {
       case Some(_) => // do nothing, input is valid
-      case None => throw new ContentValidationFailedException(paramName, "Input cannot be None")
+      case None => throw ContentValidationFailedException(paramName, "Input cannot be None")
     }
   }
 }