legger til to hjelpefunksjoner

navikt · Nov 5, 2024 · 0d94bc8 · 0d94bc8
1 parent e6bdc33
commit 0d94bc8
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 0 deletions.
diff --git a/result-object/src/main/kotlin/com/github/navikt/tbd_libs/result_object/Result.kt b/result-object/src/main/kotlin/com/github/navikt/tbd_libs/result_object/Result.kt
@@ -5,6 +5,11 @@ sealed interface Result<out T> {
     data class Error(val error: String, val cause: Throwable? = null) : Result<Nothing>
 }
 
+fun <T> Result<T>.getOrThrow() = when (this) {
+    is Result.Error -> throw RuntimeException(error, cause)
+    is Result.Ok -> value
+}
+
 fun <T, R> Result<T>.map(whenOk: (T) -> Result<R>) = when (this) {
     is Result.Error -> this
     is Result.Ok -> whenOk(value)
@@ -18,6 +23,14 @@ fun <T, R> Result<T>.fold(
     is Result.Ok -> whenOk(value)
 }
 
+fun <R> tryCatch(block: () -> R): Result<R> {
+    return try {
+        block().ok()
+    } catch (err: Exception) {
+        err.error(err.message.toString())
+    }
+}
+
 fun <T> List<Result<T>>.flatten(): Result<List<T>> {
     return fold(Result.Ok(emptyList<T>()) as Result<List<T>>) { acc, result ->
         result.fold(

diff --git a/result-object/src/test/kotlin/com/github/navikt/tbd_libs/result_object/ResultTest.kt b/result-object/src/test/kotlin/com/github/navikt/tbd_libs/result_object/ResultTest.kt
@@ -1,6 +1,7 @@
 package com.github.navikt.tbd_libs.result_object
 
 import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.assertThrows
 import org.junit.jupiter.api.Test
 
 class ResultTest {
@@ -89,6 +90,31 @@ class ResultTest {
         }
     }
 
+    @Test
+    fun `get or throw`() {
+        assertThrows<RuntimeException> {
+            "Error msg".error().getOrThrow()
+        }.also { assertEquals("Error msg", it.message) }
+
+        assertEquals("Hei", "Hei".ok().getOrThrow())
+    }
+
+    @Test
+    fun tryCatching() {
+        tryCatch {
+            "Hei, på deg!"
+        }.also {
+            it as Result.Ok
+            assertEquals("Hei, på deg!", it.value)
+        }
+        tryCatch<String> {
+            error("Whoops!")
+        }.also {
+            it as Result.Error
+            assertEquals("Whoops!", it.error)
+        }
+    }
+
     private fun testfun(feil: Boolean): Result<Testobject> {
         return when (feil) {
             true -> Result.Error("Denne gir feil altså!")