Remove @accessible macro from SipiService

dasch-swiss · Mar 18, 2024 · 2bde84e · 2bde84e
1 parent 715c644
commit 2bde84e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/...src/main/scala/org/knora/webapi/messages/v2/responder/valuemessages/ValueMessagesV2.scala b/...src/main/scala/org/knora/webapi/messages/v2/responder/valuemessages/ValueMessagesV2.scala
@@ -5,7 +5,7 @@
 
 package org.knora.webapi.messages.v2.responder.valuemessages
 
-import zio.*
+import zio.ZIO
 
 import java.time.Instant
 import java.util.UUID
@@ -1143,8 +1143,13 @@ object ValueContentV2 {
       metadata <- ingestState match {
                     case AssetIngestState.AssetIngested =>
                       val assetId = AssetId.unsafeFrom(internalFilename.substring(0, internalFilename.indexOf('.')))
-                      SipiService.getFileMetadataFromDspIngest(Shortcode.unsafeFrom(shortcode), assetId).logError
-                    case AssetIngestState.AssetInTemp => SipiService.getFileMetadataFromSipiTemp(internalFilename)
+                      ZIO
+                        .serviceWithZIO[SipiService](
+                          _.getFileMetadataFromDspIngest(Shortcode.unsafeFrom(shortcode), assetId),
+                        )
+                        .logError
+                    case AssetIngestState.AssetInTemp =>
+                      ZIO.serviceWithZIO[SipiService](_.getFileMetadataFromSipiTemp(internalFilename))
                   }
     } yield FileInfo(internalFilename, metadata)
 }

diff --git a/webapi/src/main/scala/org/knora/webapi/store/iiif/api/SipiService.scala b/webapi/src/main/scala/org/knora/webapi/store/iiif/api/SipiService.scala
@@ -8,7 +8,6 @@ package org.knora.webapi.store.iiif.api
 import zio.*
 import zio.json.DeriveJsonDecoder
 import zio.json.JsonDecoder
-import zio.macros.accessible
 import zio.nio.file.Path
 
 import org.knora.webapi.messages.store.sipimessages.*
@@ -60,7 +59,6 @@ object FileMetadataSipiResponse {
   implicit val decoder: JsonDecoder[FileMetadataSipiResponse] = DeriveJsonDecoder.gen[FileMetadataSipiResponse]
 }
 
-@accessible
 trait SipiService {
 
   /**