0.9.5

Author: MarioAriasC

README.md

@@ -36,7 +36,7 @@ Then you can use funKTionale dependency
 <dependency>
     <groupId>org.funktionale</groupId>
     <artifactId>funktionale</artifactId>
-    <version>0.9</version>
+    <version>0.9.5</version>
 </dependency>
 ```
 

pom.xml

@@ -22,7 +22,7 @@
 
     <groupId>org.funktionale</groupId>
     <artifactId>funktionale</artifactId>
-    <version>0.9</version>
+    <version>0.9.5</version>
     <packaging>jar</packaging>
     <name>funKTionale</name>
     <description>Functional constructs and utilities for Kotlin</description>
@@ -68,7 +68,7 @@
         </developer>
     </developers>
     <properties>
-        <kotlin.version>1.0.3</kotlin.version>
+        <kotlin.version>1.0.4</kotlin.version>
     </properties>
     <dependencies>
         <dependency>

src/main/kotlin/org/funktionale/either/Disjunction.kt

@@ -91,7 +91,7 @@ sealed class Disjunction<out L : Any, out R : Any> : EitherLike {
         override fun component1(): L = value
         override fun component2(): R? = null
         override fun equals(other: Any?): Boolean = when (other) {
-            is Left<*, *> -> value.equals(other.value)
+            is Left<*, *> -> value == other.value
             else -> false
         }
 
@@ -107,7 +107,7 @@ sealed class Disjunction<out L : Any, out R : Any> : EitherLike {
         override fun component2(): R = value
 
         override fun equals(other: Any?): Boolean = when (other) {
-            is Right<*, *> -> value.equals(other.value)
+            is Right<*, *> -> value == other.value
             else -> false
         }
 

src/main/kotlin/org/funktionale/either/Either.kt

@@ -54,7 +54,7 @@ sealed class Either<out L : Any, out R : Any> : EitherLike {
         override fun component2(): R? = null
 
         override fun equals(other: Any?): Boolean = when (other) {
-            is Left<*, *> -> l.equals(other.l)
+            is Left<*, *> -> l == other.l
             else -> false
 
         }
@@ -69,7 +69,7 @@ sealed class Either<out L : Any, out R : Any> : EitherLike {
         override fun component2(): R = r
 
         override fun equals(other: Any?): Boolean = when (other) {
-            is Right<*, *> -> r.equals(other.r)
+            is Right<*, *> -> r == other.r
             else -> false
         }
 

src/main/kotlin/org/funktionale/memoization/namespace.kt

@@ -272,7 +272,7 @@ private data class MemoizeKey22<out P1, out P2, out P3, out P4, out P5, out P6,
     override fun invoke(f: (P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12, P13, P14, P15, P16, P17, P18, P19, P20, P21, P22) -> R) = f(p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12, p13, p14, p15, p16, p17, p18, p19, p20, p21, p22)
 }
 
-private class MemoizedHandler<F, in K : MemoizedCall<F, R>, R : Any>(val f: F) {
+private class MemoizedHandler<F, in K : MemoizedCall<F, R>, out R : Any>(val f: F) {
     private val m = ConcurrentHashMap<K, R>()
     operator fun invoke(k: K): R {
         return m[k].toOption().fold({

src/main/kotlin/org/funktionale/option/Option.kt

@@ -138,7 +138,7 @@ sealed class Option<out T : Any> {
         override fun isEmpty() = false
 
         override fun equals(other: Any?): Boolean = when (other) {
-            is Some<*> -> t.equals(other.get())
+            is Some<*> -> t == other.get()
             is None -> false
             else -> false
         }
@@ -235,7 +235,7 @@ fun String.firstOption(): Option<Char> {
     return firstOrNull().toOption()
 }
 
-inline fun <T : Any> Array<out T?>.firstOption(predicate: (T) -> Boolean): Option<T> {
+fun <T : Any> Array<out T?>.firstOption(predicate: (T) -> Boolean): Option<T> {
     return firstOrNull(predicate.mapNullable()).toOption()
 }
 
@@ -271,19 +271,19 @@ inline fun ShortArray.firstOption(predicate: (Short) -> Boolean): Option<Short>
     return firstOrNull(predicate).toOption()
 }
 
-inline fun <T : Any> Iterable<T?>.firstOption(predicate: (T) -> Boolean): Option<T> {
+fun <T : Any> Iterable<T?>.firstOption(predicate: (T) -> Boolean): Option<T> {
     return firstOrNull(predicate.mapNullable()).toOption()
 }
 
-inline fun <T : Any> Sequence<T?>.firstOption(predicate: (T) -> Boolean): Option<T> {
+fun <T : Any> Sequence<T?>.firstOption(predicate: (T) -> Boolean): Option<T> {
     return firstOrNull(predicate.mapNullable()).toOption()
 }
 
 inline fun String.firstOption(predicate: (Char) -> Boolean): Option<Char> {
     return firstOrNull(predicate).toOption()
 }
 
-inline fun <T : Any> ((T) -> Boolean).mapNullable(): (T?) -> Boolean {
+fun <T : Any> ((T) -> Boolean).mapNullable(): (T?) -> Boolean {
     return { it?.let { this@mapNullable(it) } ?: false }
 }
 

src/main/kotlin/org/funktionale/validation/Validation.kt

@@ -4,7 +4,6 @@ import org.funktionale.either.Disjunction
 
 class Validation<out E : Any>(vararg disjunctionSequence: Disjunction<E, *>) {
 
-
     val failures: List<E> = disjunctionSequence.filter { it.isLeft() }.map { it.swap().get() }
 
     val hasFailures: Boolean = failures.isNotEmpty()

src/test/kotlin/org/funktionale/either/DisjunctionTest.kt

@@ -73,7 +73,7 @@ class DisjunctionTest {
 
     @Test fun exists() {
         assertTrue(left.swap().exists { it == 5 })
-        assertFalse(left.exists { it.equals("kotlin") })
+        assertFalse(left.exists { it == "kotlin" })
     }
 
     @Test fun flatMap() {
@@ -82,7 +82,7 @@ class DisjunctionTest {
     }
 
     @Test fun map() {
-        assertEquals(left.swap().map { it.toString() }.get(), "5")
+        assertEquals(left.swap().map(Int::toString).get(), "5")
         assertEquals(right.map { it.length }.get(), 6)
     }
 
@@ -104,7 +104,7 @@ class DisjunctionTest {
     }
 
     @Test fun fold() {
-        assertEquals(left.fold({ it.toString() }, { it }), "5")
+        assertEquals(left.fold(Int::toString, { it }), "5")
     }
 
     @Test fun swap() {

src/test/kotlin/org/funktionale/either/EitherTest.kt

@@ -73,7 +73,7 @@ class EitherTest {
 
     @Test fun exists() {
         assertTrue(left.left().exists { it == 5 })
-        assertFalse(left.right().exists { it.equals("kotlin") })
+        assertFalse(left.right().exists { it == "kotlin" })
     }
 
     @Test fun flatMap() {
@@ -82,7 +82,7 @@ class EitherTest {
     }
 
     @Test fun map() {
-        assertEquals(left.left().map { it.toString() }.left().get(), "5")
+        assertEquals(left.left().map(Int::toString).left().get(), "5")
         assertEquals(right.right().map { it.length }.right().get(), 6)
     }
 
@@ -104,7 +104,7 @@ class EitherTest {
     }
 
     @Test fun fold() {
-        assertEquals(left.fold({ it.toString() }, { it }), "5")
+        assertEquals(left.fold(Int::toString){ it }, "5")
     }
 
     @Test fun swap() {

src/test/kotlin/org/funktionale/option/OptionTest.kt

@@ -64,8 +64,8 @@ class OptionTest {
     }
 
     @Test fun map() {
-        assertEquals(getSome().map { it.toUpperCase() }.get(), "KOTLIN")
-        assertEquals(getNone().map { it.toUpperCase() }, None)
+        assertEquals(getSome().map(String::toUpperCase).get(), "KOTLIN")
+        assertEquals(getNone().map(String::toUpperCase), None)
 
         assertEquals(getSome().map(Some(12)) { name, version -> "${name.toUpperCase()} M$version" }.get(), "KOTLIN M12")
         assertEquals(getNone().map(Some(12)) { name, version -> "${name.toUpperCase()} M$version" }, None)
@@ -82,14 +82,14 @@ class OptionTest {
     }
 
     @Test fun filter() {
-        assertEquals(getSome().filter { it.equals("java") }, None)
-        assertEquals(getNone().filter { it.equals("java") }, None)
+        assertEquals(getSome().filter { it == "java" }, None)
+        assertEquals(getNone().filter { it == "java" }, None)
         assertEquals(getSome().filter { it.startsWith('k') }.get(), "kotlin")
     }
 
     @Test fun filterNot() {
-        assertEquals(getSome().filterNot { it.equals("java") }.get(), "kotlin")
-        assertEquals(getNone().filterNot { it.equals("java") }, None)
+        assertEquals(getSome().filterNot { it == "java" }.get(), "kotlin")
+        assertEquals(getNone().filterNot { it == "java" }, None)
         assertEquals(getSome().filterNot { it.startsWith('k') }, None)
     }