From 5991d811ec1dd2bdeca9532a58417b23f43266d3 Mon Sep 17 00:00:00 2001 From: Patrik Nordwall Date: Mon, 16 Dec 2024 10:31:57 +0100 Subject: [PATCH] runtime 1.3.0-f950e4637 --- akka-javasdk-maven/akka-javasdk-parent/pom.xml | 2 +- .../akka/javasdk/testkit/impl/EventingTestKitImpl.scala | 2 +- .../src/main/scala/akka/javasdk/impl/SdkRunner.scala | 8 ++++++++ project/Dependencies.scala | 2 +- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/akka-javasdk-maven/akka-javasdk-parent/pom.xml b/akka-javasdk-maven/akka-javasdk-parent/pom.xml index 18caa0ec5..61291fa63 100644 --- a/akka-javasdk-maven/akka-javasdk-parent/pom.xml +++ b/akka-javasdk-maven/akka-javasdk-parent/pom.xml @@ -38,7 +38,7 @@ 21 - 1.3.0-03a3a40 + 1.3.0-f950e4637 UTF-8 false diff --git a/akka-javasdk-testkit/src/main/scala/akka/javasdk/testkit/impl/EventingTestKitImpl.scala b/akka-javasdk-testkit/src/main/scala/akka/javasdk/testkit/impl/EventingTestKitImpl.scala index 37b3bfef8..2c684f7bc 100644 --- a/akka-javasdk-testkit/src/main/scala/akka/javasdk/testkit/impl/EventingTestKitImpl.scala +++ b/akka-javasdk-testkit/src/main/scala/akka/javasdk/testkit/impl/EventingTestKitImpl.scala @@ -140,7 +140,7 @@ object EventingTestKitImpl { } } - + def metadataToSpi(metadata: Option[Metadata]): SpiMetadata = metadata.map(metadataToSpi).getOrElse(SpiMetadata.empty) diff --git a/akka-javasdk/src/main/scala/akka/javasdk/impl/SdkRunner.scala b/akka-javasdk/src/main/scala/akka/javasdk/impl/SdkRunner.scala index d6d8a95f6..13235dc9d 100644 --- a/akka-javasdk/src/main/scala/akka/javasdk/impl/SdkRunner.scala +++ b/akka-javasdk/src/main/scala/akka/javasdk/impl/SdkRunner.scala @@ -8,6 +8,7 @@ import java.lang.reflect.Constructor import java.lang.reflect.InvocationTargetException import java.lang.reflect.Method import java.util.concurrent.CompletionStage + import scala.annotation.nowarn import scala.concurrent.ExecutionContext import scala.concurrent.Future @@ -17,6 +18,7 @@ import scala.jdk.FutureConverters._ import scala.jdk.OptionConverters.RichOptional import scala.reflect.ClassTag import scala.util.control.NonFatal + import akka.Done import akka.actor.typed.ActorSystem import akka.annotation.InternalApi @@ -80,6 +82,7 @@ import akka.runtime.sdk.spi.SpiSettings import akka.runtime.sdk.spi.SpiWorkflow import akka.runtime.sdk.spi.StartContext import akka.runtime.sdk.spi.TimedActionDescriptor +import akka.runtime.sdk.spi.UserFunctionError import akka.runtime.sdk.spi.views.SpiViewDescriptor import akka.runtime.sdk.spi.WorkflowDescriptor import akka.stream.Materializer @@ -643,6 +646,11 @@ private final class Sdk( override def workflowDescriptors: Seq[WorkflowDescriptor] = Sdk.this.workflowDescriptors + override def reportError(err: UserFunctionError): Future[Done] = + Future.successful(Done) // FIXME implemented in other PR + + override def healthCheck(): Future[Done] = + Future.successful(Done) // FIXME implemented in other PR } } diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 694e7fc4d..1a5c3d095 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -8,7 +8,7 @@ object Dependencies { val ProtocolVersionMinor = 1 val RuntimeImage = "gcr.io/kalix-public/kalix-runtime" // Remember to bump kalix-runtime.version in akka-javasdk-maven/akka-javasdk-parent if bumping this - val RuntimeVersion = sys.props.getOrElse("kalix-runtime.version", "1.3.0-03a3a40") + val RuntimeVersion = sys.props.getOrElse("kalix-runtime.version", "1.3.0-f950e4637") } // NOTE: embedded SDK should have the AkkaVersion aligned, when updating RuntimeVersion, make sure to check // if AkkaVersion and AkkaHttpVersion are aligned