build: add code coverage

.scalafix.conf

@@ -0,0 +1,29 @@
+rules = [
+  OrganizeImports,
+  RemoveUnused
+  ]
+
+OrganizeImports {
+  blankLines = Auto
+  coalesceToWildcardImportThreshold = null
+  expandRelative = false
+  groupExplicitlyImportedImplicitsSeparately = false
+  groupedImports = Explode
+  groups = [
+    "*"
+    "re:(javax?|scala)\\."
+    "re:(dsp|org.knora)\\."
+  ]
+  importSelectorsOrder = Ascii
+  importsOrder = Ascii
+  preset = DEFAULT
+  removeUnused = true
+}
+
+RemoveUnused {
+  imports = false
+  privates = true
+  locals = true
+  patternvars = true
+  params = true
+}

Makefile

@@ -334,6 +334,11 @@ info: ## print out all variables
 check: # Run code formating check 
 	@sbt "check"
 
+.PHONY: fix
+fix: # Run code formating fix
+	@sbt "fix"
+
+
 .PHONY: help
 help: ## this help
 	@awk 'BEGIN {FS = ":.*?## "} /^[a-zA-Z_-]+:.*?## / {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}' $(MAKEFILE_LIST) | sort

build.sbt

@@ -15,7 +15,13 @@ import scala.sys.process.Process
 //////////////////////////////////////
 
 // when true enables run cancellation w/o exiting sbt
-cancelable in Global := true
+// use Ctrl-c to stop current task but not quit SBT
+Global / cancelable := true
+
+Global / scalaVersion                                   := Dependencies.ScalaVersion
+Global / semanticdbEnabled                              := true
+Global / semanticdbVersion                              := scalafixSemanticdb.revision
+Global / scalafixDependencies += "com.github.liancheng" %% "organize-imports" % "0.6.0"
 
 lazy val aggregatedProjects: Seq[ProjectReference] = Seq(webapi, sipi)
 
@@ -38,18 +44,16 @@ lazy val root: Project = Project(id = "root", file("."))
     ThisBuild / scmInfo := Some(
       ScmInfo(url("https://github.com/dasch-swiss/dsp-api"), "scm:git:git@github.com:dasch-swiss/dsp-api.git")
     ),
-    Global / scalaVersion := Dependencies.scalaVersion,
+    Global / scalaVersion := Dependencies.ScalaVersion,
     // use 'git describe' for deriving the version
     git.useGitDescribe := true,
     // override generated version string because docker hub rejects '+' in tags
     ThisBuild / version ~= (_.replace('+', '-')),
-    // use Ctrl-c to stop current task but not quit SBT
-    Global / cancelable := true,
-    publish / skip      := true
+    publish / skip := true
   )
 
-addCommandAlias("fmt", "all root/scalafmtSbt root/scalafmtAll")
-addCommandAlias("check", "all root/scalafmtSbtCheck root/scalafmtCheckAll")
+addCommandAlias("fmt", "; all root/scalafmtSbt root/scalafmtAll; root/scalafixAll")
+addCommandAlias("check", "; all root/scalafmtSbtCheck root/scalafmtCheckAll; root/scalafixAll --check")
 
 //////////////////////////////////////
 // DSP's custom SIPI
@@ -138,7 +142,8 @@ lazy val webapi: Project = Project(id = "webapi", base = file("webapi"))
       "-unchecked",
       "-deprecation",
       "-Yresolve-term-conflict:package",
-      "-Ymacro-annotations"
+      "-Ymacro-annotations",
+      "-Ywarn-unused"
     ),
     logLevel          := Level.Info,
     run / javaOptions := webapiJavaRunOptions,
@@ -195,7 +200,7 @@ lazy val webapi: Project = Project(id = "webapi", base = file("webapi"))
     buildInfoKeys ++= Seq[BuildInfoKey](
       name,
       version,
-      "akkaHttp" -> Dependencies.akkaHttpVersion,
+      "akkaHttp" -> Dependencies.AkkaHttpVersion,
       "sipi"     -> Dependencies.sipiImage,
       "fuseki"   -> Dependencies.fusekiImage
     ),
@@ -251,7 +256,8 @@ lazy val roleInterface = project
       "-unchecked",
       "-deprecation",
       "-Yresolve-term-conflict:package",
-      "-Ymacro-annotations"
+      "-Ymacro-annotations",
+      "-Ywarn-unused"
     ),
     name := "roleInterface",
     libraryDependencies ++= Dependencies.roleInterfaceLibraryDependencies,
@@ -267,7 +273,8 @@ lazy val roleHandler = project
       "-unchecked",
       "-deprecation",
       "-Yresolve-term-conflict:package",
-      "-Ymacro-annotations"
+      "-Ymacro-annotations",
+      "-Ywarn-unused"
     ),
     name := "roleHandler",
     libraryDependencies ++= Dependencies.roleHandlerLibraryDependencies,
@@ -287,7 +294,8 @@ lazy val roleRepo = project
       "-unchecked",
       "-deprecation",
       "-Yresolve-term-conflict:package",
-      "-Ymacro-annotations"
+      "-Ymacro-annotations",
+      "-Ywarn-unused"
     ),
     name := "roleRepo",
     libraryDependencies ++= Dependencies.roleRepoLibraryDependencies,
@@ -303,7 +311,8 @@ lazy val roleCore = project
       "-unchecked",
       "-deprecation",
       "-Yresolve-term-conflict:package",
-      "-Ymacro-annotations"
+      "-Ymacro-annotations",
+      "-Ywarn-unused"
     ),
     name := "roleCore",
     libraryDependencies ++= Dependencies.roleCoreLibraryDependencies,
@@ -321,7 +330,8 @@ lazy val userInterface = project
       "-unchecked",
       "-deprecation",
       "-Yresolve-term-conflict:package",
-      "-Ymacro-annotations"
+      "-Ymacro-annotations",
+      "-Ywarn-unused"
     ),
     name := "userInterface",
     libraryDependencies ++= Dependencies.userInterfaceLibraryDependencies,
@@ -337,7 +347,8 @@ lazy val userHandler = project
       "-unchecked",
       "-deprecation",
       "-Yresolve-term-conflict:package",
-      "-Ymacro-annotations"
+      "-Ymacro-annotations",
+      "-Ywarn-unused"
     ),
     name := "userHandler",
     libraryDependencies ++= Dependencies.userHandlerLibraryDependencies,
@@ -357,7 +368,8 @@ lazy val userRepo = project
       "-unchecked",
       "-deprecation",
       "-Yresolve-term-conflict:package",
-      "-Ymacro-annotations"
+      "-Ymacro-annotations",
+      "-Ywarn-unused"
     ),
     name := "userRepo",
     libraryDependencies ++= Dependencies.userRepoLibraryDependencies,
@@ -373,7 +385,8 @@ lazy val userCore = project
       "-unchecked",
       "-deprecation",
       "-Yresolve-term-conflict:package",
-      "-Ymacro-annotations"
+      "-Ymacro-annotations",
+      "-Ywarn-unused"
     ),
     name := "userCore",
     libraryDependencies ++= Dependencies.userCoreLibraryDependencies,
@@ -391,7 +404,8 @@ lazy val schemaCore = project
       "-unchecked",
       "-deprecation",
       "-Yresolve-term-conflict:package",
-      "-Ymacro-annotations"
+      "-Ymacro-annotations",
+      "-Ywarn-unused"
     ),
     name := "schemaCore",
     libraryDependencies ++= Dependencies.schemaCoreLibraryDependencies,
@@ -404,6 +418,14 @@ lazy val schemaCore = project
 lazy val shared = project
   .in(file("dsp-shared"))
   .settings(
+    scalacOptions ++= Seq(
+      "-feature",
+      "-unchecked",
+      "-deprecation",
+      "-Yresolve-term-conflict:package",
+      "-Ymacro-annotations",
+      "-Ywarn-unused"
+    ),
     name := "shared",
     libraryDependencies ++= Dependencies.sharedLibraryDependencies,
     testFrameworks := Seq(new TestFramework("zio.test.sbt.ZTestFramework"))

dsp-shared/src/main/scala/dsp/valueobjects/Group.scala

@@ -6,6 +6,7 @@
 package dsp.valueobjects
 
 import zio.prelude.Validation
+
 import dsp.errors.BadRequestException
 
 object Group {

dsp-shared/src/main/scala/dsp/valueobjects/Id.scala

@@ -5,7 +5,6 @@
 
 package dsp.valueobjects
 
-import dsp.errors.BadRequestException
 import zio.prelude.Validation
 
 import java.util.UUID

dsp-shared/src/main/scala/dsp/valueobjects/Iri.scala

@@ -5,10 +5,11 @@
 
 package dsp.valueobjects
 
-import dsp.errors.BadRequestException
 import org.apache.commons.validator.routines.UrlValidator
 import zio.prelude.Validation
 
+import dsp.errors.BadRequestException
+
 sealed trait Iri
 object Iri {
 

dsp-shared/src/main/scala/dsp/valueobjects/LangString.scala

@@ -1,8 +1,9 @@
 package dsp.valueobjects
 
-import dsp.errors.ValidationException
-import zio.prelude.Validation
 import zio._
+import zio.prelude.Validation
+
+import dsp.errors.ValidationException
 
 /**
  * LangString value object

dsp-shared/src/main/scala/dsp/valueobjects/LanguageCode.scala

@@ -5,9 +5,10 @@
 
 package dsp.valueobjects
 
-import dsp.errors.ValidationException
 import zio.prelude.Validation
 
+import dsp.errors.ValidationException
+
 /**
  * LanguageCode value object.
  */

dsp-shared/src/main/scala/dsp/valueobjects/List.scala

@@ -6,6 +6,7 @@
 package dsp.valueobjects
 
 import zio.prelude.Validation
+
 import dsp.errors.BadRequestException
 
 object List {

dsp-shared/src/main/scala/dsp/valueobjects/Project.scala

@@ -6,6 +6,7 @@
 package dsp.valueobjects
 
 import zio.prelude.Validation
+
 import dsp.errors.BadRequestException
 
 object Project {

dsp-shared/src/main/scala/dsp/valueobjects/Role.scala

@@ -5,9 +5,10 @@
 
 package dsp.valueobjects
 
+import zio.prelude.Validation
+
 import dsp.errors.BadRequestException
 import dsp.valueobjects.LanguageCode
-import zio.prelude.Validation
 
 object Role {
 

dsp-shared/src/main/scala/dsp/valueobjects/Schema.scala

@@ -6,15 +6,15 @@
 package dsp.valueobjects
 
 import com.google.gwt.safehtml.shared.UriUtils.encodeAllowEscapes
-import dsp.constants.SalsahGui
-import dsp.errors.ValidationException
-import dsp.valueobjects.{List => ListGuiElement}
 import zio.prelude.ZValidation.Failure
 import zio.prelude.ZValidation.Success
 import zio.prelude._
 
 import scala.collection.immutable.List
 
+import dsp.constants.SalsahGui
+import dsp.errors.ValidationException
+
 object Schema {
 
   /**
@@ -122,8 +122,8 @@ object Schema {
 
       // if there were errors in creating gui attributes or gui element, all of the errors are returned
       validatedGuiAttributesAndGuiElement match {
-        case Failure(log, errors) => Validation.failNonEmptyChunk(errors)
-        case Success(log, value)  => GuiObject.make(value._1.toSet, value._2)
+        case Failure(_, errors) => Validation.failNonEmptyChunk(errors)
+        case Success(_, value)  => GuiObject.make(value._1.toSet, value._2)
       }
 
     }

dsp-shared/src/main/scala/dsp/valueobjects/User.scala

@@ -5,8 +5,6 @@
 
 package dsp.valueobjects
 
-import dsp.errors.BadRequestException
-import dsp.errors.ValidationException
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder
 import org.springframework.security.crypto.scrypt.SCryptPasswordEncoder
 import zio._
@@ -15,9 +13,11 @@ import zio.prelude.Subtype
 import zio.prelude.Validation
 
 import java.security.SecureRandom
-import scala.language.experimental.macros
 import scala.util.matching.Regex
 
+import dsp.errors.BadRequestException
+import dsp.errors.ValidationException
+
 object User {
 
   // TODO-mpro: password, givenname, familyname are missing enhanced validation

dsp-shared/src/main/scala/dsp/valueobjects/V2.scala

@@ -6,15 +6,15 @@
 package dsp.valueobjects
 
 import com.google.gwt.safehtml.shared.UriUtils.encodeAllowEscapes
-import dsp.errors.BadRequestException
 import org.apache.commons.lang3.StringUtils
-import org.apache.commons.validator.routines.UrlValidator
 
 import java.nio.ByteBuffer
 import java.util.Base64
 import java.util.UUID
 import scala.util.matching.Regex
 
+import dsp.errors.BadRequestException
+
 // TODO-mpro: don't forget to remove all occurances and additional "helper"
 // implementations in webapi project which needed to be added temporary in order
 // to avoid circular dependencies after moving value objects to separate project.

dsp-shared/src/test/scala/dsp/valueobjects/GroupSpec.scala

@@ -5,10 +5,11 @@
 
 package dsp.valueobjects
 
-import dsp.valueobjects.Group._
 import zio.prelude.Validation
 import zio.test._
+
 import dsp.errors.BadRequestException
+import dsp.valueobjects.Group._
 
 /**
  * This spec is used to test the [[Group]] value objects creation.

dsp-shared/src/test/scala/dsp/valueobjects/IriSpec.scala

@@ -5,10 +5,11 @@
 
 package dsp.valueobjects
 
-import dsp.valueobjects.Iri._
 import zio.prelude.Validation
 import zio.test._
+
 import dsp.errors.BadRequestException
+import dsp.valueobjects.Iri._
 
 /**
  * This spec is used to test the [[Iri]] value objects creation.
@@ -26,7 +27,7 @@ object IriSpec extends ZIOSpecDefault {
   val validUserIri               = "http://rdfh.ch/users/jDEEitJESRi3pDaDjjQ1WQ"
   val userIriWithUUIDVersion3    = "http://rdfh.ch/users/cCmdcpn2MO211YYOplR1hQ"
 
-  def spec = (groupIriTest + listIriTest + projectIriTest)
+  def spec = (groupIriTest + listIriTest + projectIriTest + RoleIriTest + UserIriTest)
 
   private val groupIriTest = suite("IriSpec - GroupIri")(
     test("pass an empty value and return an error") {