Move Try back into util package (#378)

Author: mickael-menu

readium/adapters/pdfium/pdfium-document/src/main/java/org/readium/adapters/pdfium/document/PdfiumDocument.kt

@@ -16,10 +16,10 @@ import kotlin.reflect.KClass
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import org.readium.r2.shared.InternalReadiumApi
-import org.readium.r2.shared.error.getOrThrow
 import org.readium.r2.shared.extensions.md5
 import org.readium.r2.shared.extensions.tryOrNull
 import org.readium.r2.shared.resource.Resource
+import org.readium.r2.shared.util.getOrThrow
 import org.readium.r2.shared.util.pdf.PdfDocument
 import org.readium.r2.shared.util.pdf.PdfDocumentFactory
 import org.readium.r2.shared.util.toFile

readium/adapters/pspdfkit/pspdfkit-document/src/main/java/org/readium/adapters/pspdfkit/document/ResourceDataProvider.kt

@@ -9,9 +9,9 @@ package org.readium.adapters.pspdfkit.document
 import com.pspdfkit.document.providers.DataProvider
 import java.util.*
 import kotlinx.coroutines.runBlocking
-import org.readium.r2.shared.error.getOrElse
 import org.readium.r2.shared.resource.Resource
 import org.readium.r2.shared.resource.synchronized
+import org.readium.r2.shared.util.getOrElse
 import org.readium.r2.shared.util.isLazyInitialized
 import timber.log.Timber
 

readium/lcp/src/main/java/org/readium/r2/lcp/LcpContentProtection.kt

@@ -11,10 +11,6 @@ import org.readium.r2.lcp.license.model.LicenseDocument
 import org.readium.r2.shared.asset.Asset
 import org.readium.r2.shared.asset.AssetRetriever
 import org.readium.r2.shared.asset.AssetType
-import org.readium.r2.shared.error.ThrowableError
-import org.readium.r2.shared.error.Try
-import org.readium.r2.shared.error.flatMap
-import org.readium.r2.shared.error.getOrElse
 import org.readium.r2.shared.publication.Publication
 import org.readium.r2.shared.publication.encryption.encryption
 import org.readium.r2.shared.publication.flatten
@@ -24,7 +20,11 @@ import org.readium.r2.shared.resource.ArchiveFactory
 import org.readium.r2.shared.resource.Resource
 import org.readium.r2.shared.resource.ResourceFactory
 import org.readium.r2.shared.resource.TransformingContainer
+import org.readium.r2.shared.util.ThrowableError
+import org.readium.r2.shared.util.Try
 import org.readium.r2.shared.util.Url
+import org.readium.r2.shared.util.flatMap
+import org.readium.r2.shared.util.getOrElse
 import org.readium.r2.shared.util.toFile
 
 internal class LcpContentProtection(

readium/lcp/src/main/java/org/readium/r2/lcp/LcpDecryptor.kt

@@ -10,9 +10,6 @@
 package org.readium.r2.lcp
 
 import java.io.IOException
-import org.readium.r2.shared.error.Try
-import org.readium.r2.shared.error.getOrElse
-import org.readium.r2.shared.error.getOrThrow
 import org.readium.r2.shared.extensions.coerceFirstNonNegative
 import org.readium.r2.shared.extensions.inflate
 import org.readium.r2.shared.extensions.requireLengthFitInt
@@ -25,7 +22,10 @@ import org.readium.r2.shared.resource.TransformingResource
 import org.readium.r2.shared.resource.flatMap
 import org.readium.r2.shared.resource.flatMapCatching
 import org.readium.r2.shared.resource.mapCatching
+import org.readium.r2.shared.util.Try
 import org.readium.r2.shared.util.Url
+import org.readium.r2.shared.util.getOrElse
+import org.readium.r2.shared.util.getOrThrow
 
 /**
  * Decrypts a resource protected with LCP.

readium/lcp/src/main/java/org/readium/r2/lcp/LcpDecryptorTest.kt

@@ -10,12 +10,12 @@
 package org.readium.r2.lcp
 
 import kotlin.math.ceil
-import org.readium.r2.shared.error.getOrElse
-import org.readium.r2.shared.error.getOrThrow
 import org.readium.r2.shared.extensions.coerceIn
 import org.readium.r2.shared.publication.Publication
 import org.readium.r2.shared.resource.Resource
 import org.readium.r2.shared.resource.mapCatching
+import org.readium.r2.shared.util.getOrElse
+import org.readium.r2.shared.util.getOrThrow
 import org.readium.r2.shared.util.use
 import timber.log.Timber
 

readium/lcp/src/main/java/org/readium/r2/lcp/LcpLicense.kt

@@ -15,8 +15,8 @@ import kotlinx.coroutines.runBlocking
 import org.joda.time.DateTime
 import org.readium.r2.lcp.license.model.LicenseDocument
 import org.readium.r2.lcp.license.model.StatusDocument
-import org.readium.r2.shared.error.Try
 import org.readium.r2.shared.publication.services.ContentProtectionService
+import org.readium.r2.shared.util.Try
 import timber.log.Timber
 
 /**

readium/lcp/src/main/java/org/readium/r2/lcp/LcpService.kt

@@ -30,8 +30,8 @@ import org.readium.r2.lcp.service.PassphrasesRepository
 import org.readium.r2.lcp.service.PassphrasesService
 import org.readium.r2.shared.asset.Asset
 import org.readium.r2.shared.asset.AssetRetriever
-import org.readium.r2.shared.error.Try
 import org.readium.r2.shared.publication.protection.ContentProtection
+import org.readium.r2.shared.util.Try
 import org.readium.r2.shared.util.mediatype.MediaType
 import org.readium.r2.shared.util.mediatype.MediaTypeRetriever
 

readium/lcp/src/main/java/org/readium/r2/lcp/license/License.kt

@@ -25,11 +25,11 @@ import org.readium.r2.lcp.service.DeviceService
 import org.readium.r2.lcp.service.LcpClient
 import org.readium.r2.lcp.service.LicensesRepository
 import org.readium.r2.lcp.service.NetworkService
-import org.readium.r2.shared.error.Try
-import org.readium.r2.shared.error.getOrElse
-import org.readium.r2.shared.error.getOrThrow
 import org.readium.r2.shared.extensions.toIso8601String
 import org.readium.r2.shared.extensions.tryOrNull
+import org.readium.r2.shared.util.Try
+import org.readium.r2.shared.util.getOrElse
+import org.readium.r2.shared.util.getOrThrow
 import org.readium.r2.shared.util.mediatype.MediaType
 import timber.log.Timber
 

readium/lcp/src/main/java/org/readium/r2/lcp/license/LicenseValidation.kt

@@ -23,7 +23,7 @@ import org.readium.r2.lcp.service.DeviceService
 import org.readium.r2.lcp.service.LcpClient
 import org.readium.r2.lcp.service.NetworkService
 import org.readium.r2.lcp.service.PassphrasesService
-import org.readium.r2.shared.error.getOrElse
+import org.readium.r2.shared.util.getOrElse
 import org.readium.r2.shared.util.mediatype.MediaType
 import timber.log.Timber
 

readium/lcp/src/main/java/org/readium/r2/lcp/license/container/ContainerLicenseContainer.kt

@@ -9,9 +9,9 @@ package org.readium.r2.lcp.license.container
 import kotlinx.coroutines.runBlocking
 import org.readium.r2.lcp.LcpException
 import org.readium.r2.lcp.license.model.LicenseDocument
-import org.readium.r2.shared.error.getOrThrow
 import org.readium.r2.shared.resource.Container
 import org.readium.r2.shared.resource.Resource
+import org.readium.r2.shared.util.getOrThrow
 
 /**
  * Access to a License Document stored in a read-only container.