to get rid of StrictLogging

Author: fupelaqu

build.sbt

@@ -2,7 +2,7 @@ ThisBuild / organization := "app.softnetwork"
 
 name := "resource"
 
-ThisBuild / version := "0.5.1"
+ThisBuild / version := "0.5.2"
 
 ThisBuild / scalaVersion := "2.12.18"
 

core/src/main/scala/app/softnetwork/resource/launch/ResourceGuardian.scala

@@ -12,9 +12,8 @@ import app.softnetwork.resource.model.GenericResource
 import app.softnetwork.resource.persistence.query.GenericResourceToExternalProcessorStream
 import app.softnetwork.session.CsrfCheck
 import app.softnetwork.session.launch.SessionGuardian
-import com.typesafe.scalalogging.StrictLogging
 
-trait ResourceGuardian[Resource <: GenericResource] extends SessionGuardian with StrictLogging {
+trait ResourceGuardian[Resource <: GenericResource] extends SessionGuardian {
   _: SchemaProvider with CsrfCheck =>
 
   def resourceEntity

core/src/main/scala/app/softnetwork/resource/persistence/query/LocalFileSystemResourceProvider.scala

@@ -8,7 +8,6 @@ import org.json4s.Formats
 import java.io.ByteArrayInputStream
 import java.nio.file.attribute.BasicFileAttributes
 import java.nio.file.{Files, LinkOption, Paths}
-import java.util.Date
 import scala.util.{Failure, Success, Try}
 
 protected[resource] trait LocalFileSystemResourceProvider
@@ -58,7 +57,7 @@ protected[resource] trait LocalFileSystemResourceProvider
     } match {
       case Success(s) => s
       case Failure(f) =>
-        logger.error(f.getMessage, f)
+        log.error(f.getMessage, f)
         None
     }
   }

core/src/main/scala/app/softnetwork/resource/service/ResourceService.scala

@@ -18,7 +18,6 @@ import app.softnetwork.session.config.Settings
 import app.softnetwork.session.model.{SessionData, SessionDataCompanion, SessionDataDecorator}
 import app.softnetwork.session.service.{ServiceWithSessionDirectives, SessionMaterials}
 import com.softwaremill.session.SessionConfig
-import com.typesafe.scalalogging.StrictLogging
 import de.heikoseeberger.akkahttpjson4s.Json4sSupport
 import org.json4s.{jackson, Formats}
 import org.json4s.jackson.Serialization
@@ -29,7 +28,6 @@ trait ResourceService[SD <: SessionData with SessionDataDecorator[SD]]
     extends Directives
     with DefaultComplete
     with Json4sSupport
-    with StrictLogging
     with ServiceWithSessionDirectives[ResourceCommand, ResourceResult, SD]
     with LoadResourceService
     with ApiRoute {

core/src/main/scala/app/softnetwork/resource/spi/LocalFileSystemProvider.scala

@@ -10,15 +10,17 @@ import app.softnetwork.resource.config.ResourceSettings.{
 }
 import app.softnetwork.utils.ImageTools.ImageSize
 import app.softnetwork.utils.{Base64Tools, ImageTools}
-import com.typesafe.scalalogging.StrictLogging
+import org.slf4j.Logger
 
 import java.nio.file.{Files, LinkOption, Path, Paths}
 import java.util.stream.Collectors
 import scala.collection.JavaConverters._
 import scala.util.matching.Regex
 import scala.util.{Failure, Success, Try}
 
-trait LocalFileSystemProvider extends ResourceProvider with StrictLogging {
+trait LocalFileSystemProvider extends ResourceProvider {
+
+  def log: Logger
 
   lazy val rootDir = s"$ResourceDirectory/$environment"
 
@@ -40,8 +42,8 @@ trait LocalFileSystemProvider extends ResourceProvider with StrictLogging {
       val dir = Paths.get(rootDir, uri.getOrElse(""))
       if (!Files.exists(dir)) {
         Try(Files.createDirectories(dir)) match {
-          case Success(_) => logger.info(s"$dir created successfully")
-          case Failure(f) => logger.error(s"$dir can not be created -> ${f.getMessage}", f)
+          case Success(_) => log.info(s"$dir created successfully")
+          case Failure(f) => log.error(s"$dir can not be created -> ${f.getMessage}", f)
         }
       }
       val decoded = Base64Tools.decodeBase64(data)
@@ -55,7 +57,7 @@ trait LocalFileSystemProvider extends ResourceProvider with StrictLogging {
     } match {
       case Success(_) => true
       case Failure(f) =>
-        logger.error(f.getMessage, f)
+        log.error(f.getMessage, f)
         false
     }
   }
@@ -138,7 +140,7 @@ trait LocalFileSystemProvider extends ResourceProvider with StrictLogging {
     } match {
       case Success(_) => true
       case Failure(f) =>
-        logger.error(f.getMessage, f)
+        log.error(f.getMessage, f)
         false
     }
   }
@@ -155,8 +157,8 @@ trait LocalFileSystemProvider extends ResourceProvider with StrictLogging {
       val dir = Paths.get(rootDir, LibraryDirectory, strictUri(uri))
       if (!Files.exists(dir)) {
         Try(Files.createDirectories(dir)) match {
-          case Success(_) => logger.info(s"$dir created successfully")
-          case Failure(f) => logger.error(s"$dir can not be created -> ${f.getMessage}", f)
+          case Success(_) => log.info(s"$dir created successfully")
+          case Failure(f) => log.error(s"$dir can not be created -> ${f.getMessage}", f)
         }
       }
       Files
@@ -195,7 +197,7 @@ trait LocalFileSystemProvider extends ResourceProvider with StrictLogging {
           )
         })
       case Failure(f) =>
-        logger.error(f.getMessage, f)
+        log.error(f.getMessage, f)
         List.empty
     }
   }

testkit/src/main/scala/app/softnetwork/resource/scalatest/ResourceToLocalFileSystemRouteTestKit.scala

@@ -86,7 +86,7 @@ trait ResourceToLocalFileSystemRouteTestKit[SD <: SessionData with SessionDataDe
         strictUri = strictUri.substring(7)
       }
       val path = s"$rootDir$strictUri/$sessionUuid"
-      logger.info(path)
+      log.info(path)
       assert(Files.exists(Paths.get(path)))
       refreshSession(headers)
       withHeaders(
@@ -114,7 +114,7 @@ trait ResourceToLocalFileSystemRouteTestKit[SD <: SessionData with SessionDataDe
         strictUri = strictUri.substring(7)
       }
       val path = s"$rootDir$strictUri/$sessionUuid"
-      logger.info(path)
+      log.info(path)
       assert(!Files.exists(Paths.get(path)))
       refreshSession(headers)
       withHeaders(