Merge pull request #2 from SOFTNETWORK-APP/feature/quality

to fix code style issues

Author: fupelaqu

README.md

@@ -3,7 +3,7 @@ This file is auto-generate by a github hook please modify r.md if you don't want
 -->
 ![Build Status](https://github.com/SOFTNETWORK-APP/generic-resource-api/workflows/Build/badge.svg)
 [![Scala Steward badge](https://img.shields.io/badge/Scala_Steward-helping-blue.svg?style=flat&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAQCAMAAAARSr4IAAAAVFBMVEUAAACHjojlOy5NWlrKzcYRKjGFjIbp293YycuLa3pYY2LSqql4f3pCUFTgSjNodYRmcXUsPD/NTTbjRS+2jomhgnzNc223cGvZS0HaSD0XLjbaSjElhIr+AAAAAXRSTlMAQObYZgAAAHlJREFUCNdNyosOwyAIhWHAQS1Vt7a77/3fcxxdmv0xwmckutAR1nkm4ggbyEcg/wWmlGLDAA3oL50xi6fk5ffZ3E2E3QfZDCcCN2YtbEWZt+Drc6u6rlqv7Uk0LdKqqr5rk2UCRXOk0vmQKGfc94nOJyQjouF9H/wCc9gECEYfONoAAAAASUVORK5CYII=)](https://scala-steward.org)
-[![codecov](https://codecov.io/gh/SOFTNETWORK-APP/generic-resource-api/branch/main/graph/badge.svg)](https://codecov.io/gh/SOFTNETWORK-APP/generic-resource-api/)
+[![codecov](https://codecov.io/gh/SOFTNETWORK-APP/generic-resource-api/branch/feature%2Fquality/graph/badge.svg)](https://codecov.io/gh/SOFTNETWORK-APP/generic-resource-api/)
 [![Codacy Badge](https://app.codacy.com/project/badge/Grade/122252a6bdfb41c3af16d31f8cefaecc)](https://www.codacy.com/gh/SOFTNETWORK-APP/generic-resource-api/dashboard?utm_source=github.com&utm_medium=referral&utm_content=SOFTNETWORK-APP/generic-resource-api&utm_campaign=Badge_Grade)
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
 

api/src/main/scala/app/softnetwork/resource/api/ResourceApi.scala

@@ -4,6 +4,7 @@ import akka.actor.typed.ActorSystem
 import app.softnetwork.persistence.jdbc.query.JdbcSchema.SchemaType
 import app.softnetwork.persistence.jdbc.query.JdbcSchemaProvider
 import app.softnetwork.persistence.launch.PersistentEntity
+import app.softnetwork.persistence.launch.PersistenceGuardian._
 import app.softnetwork.resource.launch.GenericResourceApplication
 import app.softnetwork.resource.message.ResourceEvents.ResourceEvent
 import app.softnetwork.resource.message.ResourceMessages.{ResourceCommand, ResourceResult}
@@ -13,8 +14,6 @@ import app.softnetwork.resource.persistence.typed.ResourceBehavior
 trait ResourceApi extends GenericResourceApplication[Resource] with JdbcSchemaProvider {
   def jdbcSchemaType: SchemaType = this.schemaType
 
-  import app.softnetwork.persistence.launch.PersistenceGuardian._
-
   override def resourceEntity
     : ActorSystem[_] => PersistentEntity[ResourceCommand, Resource, ResourceEvent, ResourceResult] =
     _ => ResourceBehavior

build.sbt

@@ -31,7 +31,7 @@ ThisBuild / organization := "app.softnetwork"
 
 name := "resource"
 
-ThisBuild / version := "0.1.1"
+ThisBuild / version := "0.1.2"
 
 ThisBuild / scalaVersion := "2.12.15"
 

common/src/main/scala/app/softnetwork/resource/config/ResourceSettings.scala

@@ -5,6 +5,8 @@ import com.typesafe.config.{Config, ConfigFactory}
 import com.typesafe.scalalogging.StrictLogging
 import configs.Configs
 
+import scala.collection.JavaConverters._
+
 object ResourceSettings extends StrictLogging {
 
   lazy val config: Config = ConfigFactory.load()
@@ -19,8 +21,6 @@ object ResourceSettings extends StrictLogging {
 
   val LibraryDirectory: String = config.getString("resource.library-directory")
 
-  import scala.collection.JavaConverters._
-
   val ImageSizes: Map[String, ImageSize] = config
     .getStringList("resource.images.sizes")
     .asScala

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

@@ -13,7 +13,7 @@ import app.softnetwork.resource.handlers.{GenericResourceHandler, ResourceHandle
 import app.softnetwork.resource.message.ResourceMessages._
 import com.softwaremill.session.CsrfDirectives._
 import com.softwaremill.session.CsrfOptions._
-import org.softnetwork.session.model.Session
+import org.softnetwork.session.model.Session._
 import app.softnetwork.persistence.service.Service
 import app.softnetwork.resource.spi._
 import app.softnetwork.serialization.commonFormats
@@ -38,8 +38,6 @@ trait GenericResourceService
 
   implicit def formats: Formats = commonFormats
 
-  import Session._
-
   val route: Route = {
     pathPrefix(ResourceSettings.ResourcePath) {
       library ~ images ~ resource()

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

@@ -13,6 +13,8 @@ import app.softnetwork.utils.{Base64Tools, ImageTools, MimeTypeTools}
 import com.typesafe.scalalogging.StrictLogging
 
 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}
 
@@ -154,8 +156,6 @@ trait LocalFileSystemProvider extends ResourceProvider with StrictLogging {
   override def listResources(uri: String): List[SimpleResource] = {
     Try {
       val dir = Paths.get(rootDir, LibraryDirectory, uri)
-      import java.util.stream.Collectors
-      import scala.collection.JavaConverters._
       Files
         .list(dir)
         .filter(path =>

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

@@ -2,6 +2,7 @@ package app.softnetwork.resource.scalatest
 
 import akka.actor.typed.ActorSystem
 import app.softnetwork.persistence.launch.PersistentEntity
+import app.softnetwork.persistence.launch.PersistenceGuardian._
 import app.softnetwork.persistence.query.InMemoryJournalProvider
 import app.softnetwork.resource.message.ResourceEvents.ResourceEvent
 import app.softnetwork.resource.message.ResourceMessages.{ResourceCommand, ResourceResult}
@@ -15,8 +16,6 @@ import org.scalatest.Suite
 
 trait ResourceToLocalFileSystemTestKit extends GenericResourceTestKit[Resource] { _: Suite =>
 
-  import app.softnetwork.persistence.launch.PersistenceGuardian._
-
   override def resourceEntity
     : ActorSystem[_] => PersistentEntity[ResourceCommand, Resource, ResourceEvent, ResourceResult] =
     _ => ResourceBehavior

testkit/src/test/scala/app/softnetwork/resource/handlers/ResourceHandlerSpec.scala

@@ -26,20 +26,20 @@ class ResourceHandlerSpec
 
   implicit lazy val system: ActorSystem[_] = typedSystem()
 
-  var _bytes: Array[Byte] = _
+  var bytes: Array[Byte] = _
 
-  var _md5: String = _
+  var md5: String = _
 
   val uri: Option[String] = Some("/resources")
 
   override def beforeAll(): Unit = {
     super.beforeAll()
     val path =
       Paths.get(Thread.currentThread().getContextClassLoader.getResource("avatar.png").getPath)
-    _bytes = Files.readAllBytes(path)
-    _md5 = HashTools
+    bytes = Files.readAllBytes(path)
+    md5 = HashTools
       .hashStream(
-        new ByteArrayInputStream(_bytes)
+        new ByteArrayInputStream(bytes)
       )
       .getOrElse("")
     val dir = new Directory(new File(rootDir))
@@ -79,7 +79,7 @@ class ResourceHandlerSpec
           assert(Files.exists(Paths.get(s"$rootDir${uri.getOrElse("")}/load")))
           ?("load", LoadResource("load")) await {
             case r: ResourceLoaded =>
-              r.resource.md5 shouldBe _md5
+              r.resource.md5 shouldBe md5
               for (size <- ImageSizes.values) {
                 loadResource("load", uri, None, Seq(SizeOption(size)): _*) match {
                   case Some(_) =>
@@ -140,9 +140,9 @@ class ResourceHandlerSpec
     ?(
       entityId,
       if (update) {
-        UpdateResource(entityId, _bytes, uri)
+        UpdateResource(entityId, bytes, uri)
       } else {
-        CreateResource(entityId, _bytes, uri)
+        CreateResource(entityId, bytes, uri)
       }
     )
   }