Use kotlin syntax instead of optional

Signed-off-by: Chase Engelbrecht <[email protected]>
opensearch-project · Jan 3, 2024 · d4ba8de · d4ba8de
1 parent 6ac125c
commit d4ba8de
Showing 1 changed file with 4 additions and 10 deletions.
diff --git a/alerting/src/main/kotlin/org/opensearch/alerting/transport/TransportDeleteWorkflowAction.kt b/alerting/src/main/kotlin/org/opensearch/alerting/transport/TransportDeleteWorkflowAction.kt
@@ -60,7 +60,6 @@ import org.opensearch.index.reindex.DeleteByQueryRequestBuilder
 import org.opensearch.search.builder.SearchSourceBuilder
 import org.opensearch.tasks.Task
 import org.opensearch.transport.TransportService
-import java.util.Optional
 
 private val scope: CoroutineScope = CoroutineScope(Dispatchers.IO)
 /**
@@ -120,12 +119,7 @@ class TransportDeleteWorkflowAction @Inject constructor(
     ) {
         suspend fun resolveUserAndStart() {
             try {
-                val optionalWorkflow = getWorkflow()
-                if (optionalWorkflow.isEmpty) {
-                    return
-                }
-
-                val workflow = optionalWorkflow.get()
+                val workflow: Workflow = getWorkflow() ?: return
 
                 val canDelete = user == null ||
                     !doFilterForUser(user) ||
@@ -302,16 +296,16 @@ class TransportDeleteWorkflowAction @Inject constructor(
             return deletableMonitors
         }
 
-        private suspend fun getWorkflow(): Optional<Workflow> {
+        private suspend fun getWorkflow(): Workflow? {
             val getRequest = GetRequest(ScheduledJob.SCHEDULED_JOBS_INDEX, workflowId)
 
             val getResponse: GetResponse = client.suspendUntil { get(getRequest, it) }
             if (!getResponse.isExists) {
                 handleWorkflowMissing()
-                return Optional.empty()
+                return null
             }
 
-            return Optional.of(parseWorkflow(getResponse))
+            return parseWorkflow(getResponse)
         }
 
         private fun handleWorkflowMissing() {