Skip to content

Commit

Permalink
cleanup: Remove unused code
Browse files Browse the repository at this point in the history
  • Loading branch information
seakayone committed Apr 26, 2024
1 parent d248183 commit b043664
Show file tree
Hide file tree
Showing 7 changed files with 0 additions and 53 deletions.
Expand Up @@ -12,7 +12,6 @@ import zio.nio.file.Path

import org.knora.webapi.config.AppConfig
import org.knora.webapi.messages.store.sipimessages.DeleteTemporaryFileRequest
import org.knora.webapi.messages.store.sipimessages.IIIFServiceStatusResponse
import org.knora.webapi.messages.store.sipimessages.MoveTemporaryFileToPermanentStorageRequest
import org.knora.webapi.messages.store.sipimessages.SipiGetTextFileRequest
import org.knora.webapi.messages.store.sipimessages.SipiGetTextFileResponse
Expand Down Expand Up @@ -99,12 +98,6 @@ case class SipiServiceTestDelegator(
override def getTextFileRequest(textFileRequest: SipiGetTextFileRequest): Task[SipiGetTextFileResponse] =
sipiService.getTextFileRequest(textFileRequest)

/**
* Tries to access the IIIF Service.
*/
override def getStatus(): Task[IIIFServiceStatusResponse] =
sipiService.getStatus()

/**
* Downloads an asset from Sipi.
*
Expand Down
Expand Up @@ -61,8 +61,6 @@ case class SipiServiceMock() extends SipiService {

override def getTextFileRequest(textFileRequest: SipiGetTextFileRequest): Task[SipiGetTextFileResponse] = ???

override def getStatus(): Task[IIIFServiceStatusResponse] = ZIO.succeed(IIIFServiceStatusOK)

override def downloadAsset(asset: Asset, targetDir: Path, user: User): Task[Option[Path]] = ???

override def getFileMetadataFromDspIngest(
Expand Down
Expand Up @@ -57,31 +57,6 @@ case class SipiGetTextFileRequest(fileUrl: String, requestingUser: User, senderN
*/
case class SipiGetTextFileResponse(content: String)

//////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// IIIF Request ADM

sealed trait IIIFRequestADM extends IIIFRequest

/**
* Queries IIIF Service status.
*/
case object IIIFServiceGetStatus extends IIIFRequestADM

/**
* Represents a response for [[IIIFServiceGetStatus]].
*/
sealed trait IIIFServiceStatusResponse

/**
* Represents a positive response for [[IIIFServiceGetStatus]].
*/
case object IIIFServiceStatusOK extends IIIFServiceStatusResponse

/**
* Represents a negative response for [[IIIFServiceGetStatus]].
*/
case object IIIFServiceStatusNOK extends IIIFServiceStatusResponse

/**
* Represents the information that Sipi returns about each file that has been uploaded.
*
Expand Down
Expand Up @@ -12,7 +12,6 @@ import org.knora.webapi.core.MessageRelay
import org.knora.webapi.messages.ResponderRequest
import org.knora.webapi.messages.store.sipimessages.DeleteTemporaryFileRequest
import org.knora.webapi.messages.store.sipimessages.IIIFRequest
import org.knora.webapi.messages.store.sipimessages.IIIFServiceGetStatus
import org.knora.webapi.messages.store.sipimessages.MoveTemporaryFileToPermanentStorageRequest
import org.knora.webapi.messages.store.sipimessages.SipiGetTextFileRequest
import org.knora.webapi.store.iiif.api.SipiService
Expand All @@ -28,7 +27,6 @@ final case class IIIFRequestMessageHandlerLive(iiifService: SipiService) extends
case req: MoveTemporaryFileToPermanentStorageRequest => iiifService.moveTemporaryFileToPermanentStorage(req)
case req: DeleteTemporaryFileRequest => iiifService.deleteTemporaryFile(req)
case req: SipiGetTextFileRequest => iiifService.getTextFileRequest(req)
case IIIFServiceGetStatus => iiifService.getStatus()
case other => ZIO.logError(s"IIIFServiceManager received an unexpected message: $other")
}
}
Expand Down
Expand Up @@ -103,11 +103,6 @@ trait SipiService {
*/
def getTextFileRequest(textFileRequest: SipiGetTextFileRequest): Task[SipiGetTextFileResponse]

/**
* Tries to access the IIIF Service.
*/
def getStatus(): Task[IIIFServiceStatusResponse]

/**
* Downloads an asset from Sipi.
*
Expand Down
Expand Up @@ -234,15 +234,6 @@ final case class SipiServiceLive(
} yield SipiGetTextFileResponse(responseStr)
}

/**
* Tries to access the IIIF Service to check if Sipi is running.
*/
def getStatus(): Task[IIIFServiceStatusResponse] =
for {
request <- ZIO.succeed(new HttpGet(sipiConfig.internalBaseUrl + "/server/test.html"))
response <- doSipiRequest(request).fold(_ => IIIFServiceStatusNOK, _ => IIIFServiceStatusOK)
} yield response

/**
* Makes an HTTP request to Sipi and returns the response.
*
Expand Down
Expand Up @@ -17,7 +17,6 @@ import zio.test.assertTrue

import dsp.errors.AssertionException
import org.knora.webapi.messages.store.sipimessages.DeleteTemporaryFileRequest
import org.knora.webapi.messages.store.sipimessages.IIIFServiceStatusResponse
import org.knora.webapi.messages.store.sipimessages.MoveTemporaryFileToPermanentStorageRequest
import org.knora.webapi.messages.store.sipimessages.SipiGetTextFileRequest
import org.knora.webapi.messages.store.sipimessages.SipiGetTextFileResponse
Expand Down Expand Up @@ -95,8 +94,6 @@ object ValueContentV2Spec extends ZIOSpecDefault {
ZIO.dieMessage("unsupported operation")
def getTextFileRequest(textFileRequest: SipiGetTextFileRequest): Task[SipiGetTextFileResponse] =
ZIO.dieMessage("unsupported operation")
def getStatus(): Task[IIIFServiceStatusResponse] =
ZIO.dieMessage("unsupported operation")
def downloadAsset(asset: Asset, targetDir: Path, user: User): Task[Option[Path]] =
ZIO.dieMessage("unsupported operation")
})
Expand Down

0 comments on commit b043664

Please sign in to comment.