diff --git a/gradle.properties b/gradle.properties index 34ff5a3..ff9271c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ kotlin.code.style=official specifyKotlinAsDependency=false projectGroup=ru.dbotthepony.kommons -projectVersion=2.7.2 +projectVersion=2.7.3 guavaDepVersion=33.0.0 gsonDepVersion=2.8.9 diff --git a/src/main/kotlin/ru/dbotthepony/kommons/util/KOptional.kt b/src/main/kotlin/ru/dbotthepony/kommons/util/KOptional.kt index 37fe34b..42b1836 100644 --- a/src/main/kotlin/ru/dbotthepony/kommons/util/KOptional.kt +++ b/src/main/kotlin/ru/dbotthepony/kommons/util/KOptional.kt @@ -5,6 +5,7 @@ import java.util.function.Supplier fun KOptional(value: T) = KOptional.of(value) fun KOptional(value: Boolean) = KOptional.of(value) fun KOptional(value: Boolean?) = KOptional.of(value) +fun KOptional() = KOptional.empty() /** * [java.util.Optional] supporting nulls @@ -49,6 +50,14 @@ class KOptional private constructor(private val _value: T, val isPresent: Boo } } + inline fun flatMap(block: (T) -> KOptional): KOptional { + if (isPresent) { + return block.invoke(value) + } else { + return empty() + } + } + @Suppress("NOTHING_TO_INLINE") inline fun orElse(value: T): T { if (isPresent) {