Remove option usage

BlueBrain · Apr 2, 2024 · ec25ede · ec25ede
1 parent 224a0b2
commit ec25ede
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/ship/src/main/scala/ch/epfl/bluebrain/nexus/ship/ProjectMapper.scala b/ship/src/main/scala/ch/epfl/bluebrain/nexus/ship/ProjectMapper.scala
@@ -9,11 +9,11 @@ trait ProjectMapper {
 
 object ProjectMapper {
 
-  def apply(projectMapping: Option[ProjectMapping]): ProjectMapper =
+  def apply(projectMapping: ProjectMapping): ProjectMapper =
     (project: ProjectRef) =>
       projectMapping match {
-        case Some(mapping) => mapping.getOrElse(project, project)
-        case None          => project
+        case m if m.isEmpty => project
+        case mapping        => mapping.getOrElse(project, project)
       }
 
 }
diff --git a/ship/src/main/scala/ch/epfl/bluebrain/nexus/ship/config/ShipConfig.scala b/ship/src/main/scala/ch/epfl/bluebrain/nexus/ship/config/ShipConfig.scala
@@ -19,7 +19,7 @@ final case class ShipConfig(
     database: DatabaseConfig,
     eventLog: EventLogConfig,
     organizations: OrganizationCreationConfig,
-    projectMapping: Option[ProjectMapping],
+    projectMapping: ProjectMapping = Map.empty,
     serviceAccount: ServiceAccountConfig
 )
 

diff --git a/ship/src/test/scala/ch/epfl/bluebrain/nexus/ship/config/ShipConfigSuite.scala b/ship/src/test/scala/ch/epfl/bluebrain/nexus/ship/config/ShipConfigSuite.scala
@@ -28,7 +28,7 @@ class ShipConfigSuite extends NexusSuite {
     for {
       externalConfigPath <- loader.absolutePath("config/project-mapping.conf")
       mapping             = ShipConfig.load(Some(Path(externalConfigPath))).map(_.projectMapping)
-      _                  <- mapping.assertEquals(Some(expected))
+      _                  <- mapping.assertEquals(expected)
     } yield ()
   }