#1693 Future {throw x} replaced with Future.failed(x) in rest_api…

…, cleanup

rest-api/src/main/scala/za/co/absa/enceladus/rest_api/controllers/DatasetController.scala

@@ -67,7 +67,7 @@ class DatasetController @Autowired()(datasetService: DatasetService)
           case Some((ds, validation)) => ds // v2 disregarding validation
           case _        => throw notFound()
         }
-        case _ => throw notFound()
+        case _ => Future.failed(notFound())
       }
     } yield res
   }
@@ -104,7 +104,7 @@ class DatasetController @Autowired()(datasetService: DatasetService)
         } else {
           datasetService.filterProperties(dsProperties, DatasetController.paramsToPropertyDefinitionFilter(scalaFilterMap))
         }
-      case None => throw notFound()
+      case None => Future.failed(notFound())
     }
   }
 
@@ -126,7 +126,7 @@ class DatasetController @Autowired()(datasetService: DatasetService)
   def getPropertiesValidation(@PathVariable datasetName: String, @PathVariable datasetVersion: Int): CompletableFuture[Validation] = {
     datasetService.getVersion(datasetName, datasetVersion).flatMap {
       case Some(entity) => datasetService.validateProperties(entity.propertiesAsMap, forRun = false)
-      case None => throw notFound()
+      case None => Future.failed(notFound())
     }
   }
 
@@ -135,7 +135,7 @@ class DatasetController @Autowired()(datasetService: DatasetService)
   def getPropertiesValidationForRun(@PathVariable datasetName: String, @PathVariable datasetVersion: Int): CompletableFuture[Validation] = {
     datasetService.getVersion(datasetName, datasetVersion).flatMap {
       case Some(entity) => datasetService.validateProperties(entity.propertiesAsMap, forRun = true)
-      case None => throw notFound()
+      case None => Future.failed(notFound())
     }
   }
 

rest-api/src/main/scala/za/co/absa/enceladus/rest_api/controllers/HDFSController.scala

@@ -16,14 +16,15 @@
 package za.co.absa.enceladus.rest_api.controllers
 
 import java.util.concurrent.CompletableFuture
-
 import org.apache.hadoop.fs.Path
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.http.HttpStatus
 import org.springframework.web.bind.annotation._
 import za.co.absa.enceladus.model.menas.HDFSFolder
 import za.co.absa.enceladus.rest_api.services.HDFSService
 
+import scala.concurrent.Future
+
 @RestController
 @RequestMapping(Array("/api/hdfs"))
 class HDFSController @Autowired() (hdfsService: HDFSService) extends BaseController {
@@ -41,7 +42,7 @@ class HDFSController @Autowired() (hdfsService: HDFSService) extends BaseControl
       if (exists) {
         hdfsService.getFolder(path)
       } else {
-        throw notFound()
+        Future.failed(notFound())
       }
     }
   }

rest-api/src/main/scala/za/co/absa/enceladus/rest_api/controllers/v3/DatasetControllerV3.scala

@@ -28,6 +28,7 @@ import za.co.absa.enceladus.rest_api.utils.implicits._
 import java.util.concurrent.CompletableFuture
 import javax.servlet.http.HttpServletRequest
 import scala.concurrent.ExecutionContext.Implicits.global
+import scala.concurrent.Future
 
 @RestController
 @RequestMapping(path = Array("/api-v3/datasets"))
@@ -57,14 +58,12 @@ class DatasetControllerV3 @Autowired()(datasetService: DatasetServiceV3)
         case Some((entity, validation)) =>
           // stripping last 3 segments (/dsName/dsVersion/properties), instead of /api-v3/dastasets/dsName/dsVersion/properties we want /api-v3/dastasets/dsName/dsVersion/properties
           createdWithNameVersionLocationBuilder(entity.name, entity.version, request, stripLastSegments = 3, suffix = "/properties")
-            .body(validation) // todo include in tests
+            .body(validation)
         case None => throw notFound()
       }
     }
   }
 
-  // todo putIntoInfoFile switch needed?
-
   @GetMapping(Array("/{name}/{version}/rules"))
   @ResponseStatus(HttpStatus.OK)
   def getConformanceRules(@PathVariable name: String,
@@ -90,7 +89,7 @@ class DatasetControllerV3 @Autowired()(datasetService: DatasetServiceV3)
             suffix = s"/rules/$addedRuleOrder").body(validation)
         case _ => throw notFound()
       }
-      case None => throw notFound()
+      case None => Future.failed(notFound())
     }
   }
 

rest-api/src/main/scala/za/co/absa/enceladus/rest_api/controllers/v3/VersionedModelControllerV3.scala

@@ -48,7 +48,7 @@ abstract class VersionedModelControllerV3[C <: VersionedModel with Product
 
   import scala.concurrent.ExecutionContext.Implicits.global
 
-  // todo maybe offset/limit?
+  // todo maybe offset/limit -> Issue #2060
   @GetMapping(Array(""))
   @ResponseStatus(HttpStatus.OK)
   def getList(@RequestParam searchQuery: Optional[String]): CompletableFuture[Seq[NamedVersion]] = {
@@ -59,7 +59,7 @@ abstract class VersionedModelControllerV3[C <: VersionedModel with Product
   @GetMapping(Array("/{name}"))
   @ResponseStatus(HttpStatus.OK)
   def getVersionSummaryForEntity(@PathVariable name: String): CompletableFuture[NamedVersion] = {
-    versionedModelService.getLatestVersionSummary(name) map {
+    versionedModelService.getLatestVersionSummary(name).map {
       case Some(entity) => entity.toNamedVersion
       case None => throw notFound()
     }

rest-api/src/main/scala/za/co/absa/enceladus/rest_api/exceptions/EndpointDisabledException.scala

@@ -15,6 +15,5 @@
 
 package za.co.absa.enceladus.rest_api.exceptions
 
-// todo, there is no usage, remove?
 case class EndpointDisabledException(message:String = "", cause: Throwable = None.orNull) extends Exception(message, cause)