Adds options to supress exception and return false

advantagefse · Mar 6, 2019 · 628b661 · 628b661
1 parent f7dbe39
commit 628b661
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/src/main/kotlin/eu/afse/jsonlogic/JsonLogic.kt b/src/main/kotlin/eu/afse/jsonlogic/JsonLogic.kt
@@ -21,10 +21,13 @@ class JsonLogic {
      *
      * @param logic the logic
      * @param data the data
+     * @param safe if true an exception is returned as false else exceptions are thrown
      * @return evaluation result
      */
     @JvmOverloads
-    fun apply(logic: Any?, data: Any? = null) = evaluate(logic, data).toString()
+    fun apply(logic: Any?, data: Any? = null, safe: Boolean = true) =
+        if(safe) try { evaluate(logic, data).toString() } catch (e: kotlin.NotImplementedError) { "false" }
+        else evaluate(logic, data).toString()
 
     /**
      * Add new operations http://jsonlogic.com/add_operation.html

diff --git a/src/test/kotlin/eu/afse/jsonlogic/JsonLogicTests.kt b/src/test/kotlin/eu/afse/jsonlogic/JsonLogicTests.kt
@@ -172,10 +172,17 @@ class JsonLogicTests {
     fun unknownCustomOperation() {
         val jsonLogic = JsonLogic()
         assertThrows(kotlin.NotImplementedError::class.java) {
-            jsonLogic.apply(mapOf("hello" to listOf(1, 2, 3)))
+            jsonLogic.apply(mapOf("hello" to listOf(1, 2, 3)), safe = false)
         }
     }
 
+    @Test
+    fun unknownCustomOperation2() {
+        val jsonLogic = JsonLogic()
+        val result = jsonLogic.apply(mapOf("hello" to listOf(1, 2, 3)), safe = true)
+        assertEquals("false", result)
+    }
+
     @Test
     fun stringComparisonBug() {
         val jsonLogic = JsonLogic()