Standardized callables execution.

red-elf · Jan 13, 2024 · 83b50b6 · 83b50b6
1 parent 280ecfa
commit 83b50b6
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 40 deletions.
diff --git a/Main/src/main/java/com/redelf/commons/extensions.kt b/Main/src/main/java/com/redelf/commons/extensions.kt
@@ -48,9 +48,22 @@ fun yieldWhile(condition: () -> Boolean) {
     }
 }
 
-fun exec(callable: Callable<Boolean>, logTag: String = "Bool exec ::"): Boolean {
+fun exec(
 
-    val result = doExec(callable, logTag)
+    callable: Callable<Boolean>,
+    timeout: Long = 30L,
+    timeUnit: TimeUnit = TimeUnit.SECONDS,
+    logTag: String = "Bool exec ::"
+
+): Boolean {
+
+    val result = doExec(
+
+        callable = callable,
+        timeout = timeout,
+        timeUnit = timeUnit,
+        logTag = logTag
+    )
 
     result?.let {
 
@@ -59,7 +72,14 @@ fun exec(callable: Callable<Boolean>, logTag: String = "Bool exec ::"): Boolean
     return false
 }
 
-fun <T> doExec(callable: Callable<T>, logTag: String = "Do exec ::"): T? {
+fun <T> doExec(
+
+    callable: Callable<T>,
+    timeout: Long = 30L,
+    timeUnit: TimeUnit = TimeUnit.SECONDS,
+    logTag: String = "Do exec ::",
+
+): T? {
 
     var success: T? = null
     val future = Executor.MAIN.execute(callable)
@@ -68,7 +88,7 @@ fun <T> doExec(callable: Callable<T>, logTag: String = "Do exec ::"): T? {
 
         Timber.v("$logTag Callable: PRE-START")
 
-        success = future.get(30, TimeUnit.SECONDS)
+        success = future.get(timeout, timeUnit)
 
         if (success != null) {
 

diff --git a/Main/src/main/java/com/redelf/commons/lifecycle/Initialization.kt b/Main/src/main/java/com/redelf/commons/lifecycle/Initialization.kt
@@ -1,5 +1,6 @@
 package com.redelf.commons.lifecycle
 
+import com.redelf.commons.exec
 import com.redelf.commons.execution.Executor
 import com.redelf.commons.lifecycle.exception.NotInitializedException
 import timber.log.Timber
@@ -53,43 +54,13 @@ interface Initialization<T> : InitializationCondition {
                 }
             }
 
-            val future = Executor.MAIN.execute(callable)
+            exec(
 
-            try {
-
-                val tag = "$initLogTag Init check ::"
-
-                Timber.v("$tag PRE-START")
-
-                val success = future.get(timeoutInSeconds, TimeUnit.SECONDS)
-
-                if (success) {
-
-                    Timber.v("$tag Callable: RETURNED SUCCESS")
-
-                } else {
-
-                    Timber.e("$tag Callable: RETURNED FAILURE")
-                }
-
-                Timber.v("$tag Callable: POST-END")
-
-            } catch (e: RejectedExecutionException) {
-
-                Timber.e(e)
-
-            } catch (e: InterruptedException) {
-
-                Timber.e(e)
-
-            } catch (e: ExecutionException) {
-
-                Timber.e(e)
-
-            } catch (e: TimeoutException) {
-
-                future.cancel(true)
-            }
+                callable = callable,
+                timeout = timeoutInSeconds,
+                timeUnit = TimeUnit.SECONDS,
+                logTag = initLogTag
+            )
 
             if (!who.isInitialized()) {