Merge pull request #27 from rcardin/22-dont-use-arrow-deprecated-methods

Fixed the usage of deprecated methods

Author: rcardin

src/main/kotlin/in/rcard/assertj/arrowcore/AbstractOptionAssert.kt

@@ -43,7 +43,7 @@ abstract class AbstractOptionAssert<
      */
     fun isEmpty(): SELF {
         isNotNull
-        if (actual.isDefined()) throwAssertionError(shouldBeEmpty(actual))
+        if (actual.isSome()) throwAssertionError(shouldBeEmpty(actual))
         return myself
     }
 
@@ -74,7 +74,7 @@ abstract class AbstractOptionAssert<
      */
     fun containsInstanceOf(expectedClass: Class<*>): SELF {
         assertValueIsPresent()
-        actual.tap { value ->
+        actual.onSome { value ->
             if (!expectedClass.isInstance(value)) {
                 throwAssertionError(
                     shouldContainInstanceOf(
@@ -104,6 +104,6 @@ abstract class AbstractOptionAssert<
 
     private fun assertValueIsPresent() {
         isNotNull
-        if (actual.isEmpty()) throwAssertionError(shouldBePresent())
+        if (actual.isNone()) throwAssertionError(shouldBePresent())
     }
 }

src/main/kotlin/in/rcard/assertj/arrowcore/errors/OptionShouldBeEmpty.kt

@@ -10,7 +10,7 @@ import org.assertj.core.error.BasicErrorMessageFactory
  * @since 0.0.1
  */
 internal class OptionShouldBeEmpty private constructor(expected: Option<*>) :
-    BasicErrorMessageFactory("%nExpecting an Option to be empty but was <%s>.", expected.orNull()) {
+    BasicErrorMessageFactory("%nExpecting an Option to be empty but was <%s>.", expected.getOrNull()) {
     companion object {
         internal fun shouldBeEmpty(actual: Option<*>): OptionShouldBeEmpty =
             OptionShouldBeEmpty(actual)

src/main/kotlin/in/rcard/assertj/arrowcore/errors/OptionShouldBePresent.kt

@@ -10,7 +10,7 @@ import org.assertj.core.error.BasicErrorMessageFactory
  * @since 0.0.1
  */
 internal class OptionShouldBePresent private constructor() :
-    BasicErrorMessageFactory("%nExpecting Option to contain a value but it didn't.".format()) {
+    BasicErrorMessageFactory("%nExpecting Option to contain a value but it didn't.") {
     companion object {
 
         /**