#1843 Use map instead of foldLeft

TheHive-Project · Mar 18, 2021 · 7022b9f · 7022b9f
1 parent fbc042d
commit 7022b9f
Showing 1 changed file with 11 additions and 12 deletions.
diff --git a/thehive/app/org/thp/thehive/controllers/v1/MonitoringCtrl.scala b/thehive/app/org/thp/thehive/controllers/v1/MonitoringCtrl.scala
@@ -23,26 +23,25 @@ class MonitoringCtrl @Inject() (
     implicit val format: Format[PartitionConfig] = Json.format[PartitionConfig]
   }
 
-  val diskLocations: ConfigItem[Seq[PartitionConfig], Seq[PartitionConfig]] =
+  val diskLocationsConfig: ConfigItem[Seq[PartitionConfig], Seq[PartitionConfig]] =
     appConfig.item[Seq[PartitionConfig]]("monitor.disk", "disk locations to monitor")
+  def diskLocations: Seq[PartitionConfig] = diskLocationsConfig.get
 
   def diskUsage: Action[AnyContent] =
     entrypoint("monitor disk usage")
       .authPermittedTransaction(db, Permissions.managePlatform)(implicit request =>
         implicit graph =>
           for {
             _ <- Success(())
-            locations =
-              diskLocations
-                .get
-                .foldLeft[JsArray](JsArray.empty)((array, p) =>
-                  array :+ Json.obj(
-                    "location"   -> p.location,
-                    "freeSpace"  -> new File(p.location).getFreeSpace,
-                    "totalSpace" -> new File(p.location).getTotalSpace
-                  )
-                )
-          } yield Results.Ok(locations)
+            locations = diskLocations.map { dl =>
+              val file = new File(dl.location)
+              Json.obj(
+                "location"   -> dl.location,
+                "freeSpace"  -> file.getFreeSpace,
+                "totalSpace" -> file.getTotalSpace
+              )
+            }
+          } yield Results.Ok(JsArray(locations))
       )
 
 }