Feat/from value pattern matching (#1588)

* Adde FromValue extractor for pattern matching
ing-bank · Nov 8, 2023 · 4f342b5 · 4f342b5
1 parent dfbb19a
commit 4f342b5
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 10 deletions.
diff --git a/...me/src/main/scala/com/ing/baker/runtime/akka/actor/process_instance/ProcessInstance.scala b/...me/src/main/scala/com/ing/baker/runtime/akka/actor/process_instance/ProcessInstance.scala
@@ -22,14 +22,13 @@ import com.ing.baker.runtime.akka.internal.{FatalInteractionException, RecipeRun
 import com.ing.baker.runtime.model.BakerLogging
 import com.ing.baker.runtime.scaladsl.{EventInstance, IngredientInstance, RecipeInstanceState}
 import com.ing.baker.runtime.serialization.Encryption
-import com.ing.baker.types.{Converters, PrimitiveValue, Value}
+import com.ing.baker.types.{FromValue, PrimitiveValue, Value}
 
-import java.time.Duration
 import scala.collection.immutable
 import scala.concurrent.ExecutionContext
-import scala.concurrent.duration.Duration.Zero
 import scala.concurrent.duration._
 import scala.language.existentials
+import scala.reflect.runtime.universe
 import scala.util.Try
 
 object ProcessInstance {
@@ -108,15 +107,15 @@ object ProcessInstance {
     }
   }
 
-  private val finiteDurationType = Converters.readJavaType[FiniteDuration]
-  private val durationType = Converters.readJavaType[Duration]
+  private val javaDuration = FromValue[java.time.Duration]()
+  private val finiteDuration = FromValue[FiniteDuration]()
 
   def getWaitTimeInMillis(interactionTransition: InteractionTransition, state: RecipeInstanceState): Long = {
     val input: immutable.Seq[IngredientInstance] = RecipeRuntime.createInteractionInput(interactionTransition, state)
     if (input.size != 1) throw new FatalInteractionException(s"Delayed transitions can only have 1 input ingredient")
-    input.head.value match  {
-      case value if value.isInstanceOf(finiteDurationType) => value.as[FiniteDuration].toMillis
-      case value if value.isInstanceOf(durationType) => value.as[java.time.Duration].toMillis
+    input.head.value match {
+      case javaDuration(d) => d.toMillis
+      case finiteDuration(fd) => fd.toMillis
       case _ => throw new FatalInteractionException(s"Delayed transition ingredient not of type scala.concurrent.duration.FiniteDuration or java.time.Duration")
     }
   }
@@ -265,7 +264,7 @@ class ProcessInstance[S, E](
 
     case IdleStop(n) =>
       if (n == instance.sequenceNr && instance.activeJobs.isEmpty) {
-        log.idleStop(recipeInstanceId, settings.idleTTL.getOrElse(Zero))
+        log.idleStop(recipeInstanceId, settings.idleTTL.getOrElse(Duration.Zero))
         stopMe()
       }
 

diff --git a/...rc/test/scala/com/ing/baker/runtime/akka/actor/process_instance/ProcessInstanceSpec.scala b/...rc/test/scala/com/ing/baker/runtime/akka/actor/process_instance/ProcessInstanceSpec.scala
@@ -24,7 +24,7 @@ import com.ing.baker.runtime.akka.namedCachedThreadPool
 import com.ing.baker.runtime.scaladsl.RecipeInstanceState
 import com.ing.baker.runtime.serialization.Encryption.NoEncryption
 import com.ing.baker.types
-import com.ing.baker.types.{Converters, Int32, Int64, PrimitiveValue, RecordField, Value}
+import com.ing.baker.types.{Converters, Value}
 import org.mockito.ArgumentMatchers.any
 import org.mockito.Mockito._
 import org.mockito.invocation.InvocationOnMock

diff --git a/core/baker-types/src/main/scala/com/ing/baker/types/Value.scala b/core/baker-types/src/main/scala/com/ing/baker/types/Value.scala
@@ -217,3 +217,14 @@ case class ListValue(entries: List[Value]) extends Value {
 
   override def toString: String = entries.mkString("[", ",", "]")
 }
+
+object FromValue {
+  class FromValueExtractor[T: universe.TypeTag]() {
+    def unapply(v: Value) = Try {
+      v.as[T]
+    }.toOption
+  }
+
+  def apply[T: universe.TypeTag]() = new FromValueExtractor[T]
+}
+