chore: Update views to use new SPI type structure

akka-javasdk-maven/akka-javasdk-parent/pom.xml

@@ -38,7 +38,7 @@
 
         <!-- These are dependent on runtime environment and cannot be customized by users -->
         <maven.compiler.release>21</maven.compiler.release>
-        <kalix-runtime.version>1.3.0-cb36dd2e</kalix-runtime.version>
+        <kalix-runtime.version>1.3.0-645b7b0</kalix-runtime.version>
 
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <skip.docker>false</skip.docker>

akka-javasdk/src/main/scala/akka/javasdk/impl/SdkRunner.scala

@@ -83,7 +83,7 @@ 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.ViewDescriptor
 import akka.runtime.sdk.spi.WorkflowDescriptor
 import akka.stream.Materializer
 import com.typesafe.config.Config
@@ -450,7 +450,12 @@ private final class Sdk(
               })
         }
         eventSourcedEntityDescriptors :+=
-          new EventSourcedEntityDescriptor(componentId, clz.getName, readOnlyCommandNames, instanceFactory)
+          new EventSourcedEntityDescriptor(
+            componentId,
+            clz.getName,
+            readOnlyCommandNames,
+            instanceFactory,
+            keyValue = false)
 
       case clz if classOf[KeyValueEntity[_]].isAssignableFrom(clz) =>
         val componentId = clz.getAnnotation(classOf[ComponentId]).value
@@ -475,7 +480,12 @@ private final class Sdk(
               })
         }
         keyValueEntityDescriptors :+=
-          new EventSourcedEntityDescriptor(componentId, clz.getName, readOnlyCommandNames, instanceFactory)
+          new EventSourcedEntityDescriptor(
+            componentId,
+            clz.getName,
+            readOnlyCommandNames,
+            instanceFactory,
+            keyValue = true)
 
       case clz if Reflect.isWorkflow(clz) =>
         val componentId = clz.getAnnotation(classOf[ComponentId]).value
@@ -543,7 +553,7 @@ private final class Sdk(
         logger.warn("Unknown component [{}]", clz.getName)
     }
 
-  private val viewDescriptors: Seq[SpiViewDescriptor] =
+  private val viewDescriptors: Seq[ViewDescriptor] =
     componentClasses
       .filter(hasComponentId)
       .collect {
@@ -618,7 +628,7 @@ private final class Sdk(
       override val consumersDescriptors: Seq[ConsumerDescriptor] =
         Sdk.this.consumerDescriptors
 
-      override val viewDescriptors: Seq[SpiViewDescriptor] =
+      override val viewDescriptors: Seq[ViewDescriptor] =
         Sdk.this.viewDescriptors
 
       override val workflowDescriptors: Seq[WorkflowDescriptor] =

akka-javasdk/src/main/scala/akka/javasdk/impl/view/ViewDescriptorFactory.scala

@@ -19,19 +19,20 @@ import akka.javasdk.view.TableUpdater
 import akka.javasdk.view.UpdateContext
 import akka.javasdk.view.View
 import akka.javasdk.view.View.QueryStreamEffect
+import akka.runtime.sdk.spi
 import akka.runtime.sdk.spi.ComponentOptions
 import akka.runtime.sdk.spi.ConsumerSource
 import akka.runtime.sdk.spi.MethodOptions
-import akka.runtime.sdk.spi.views.SpiQueryDescriptor
-import akka.runtime.sdk.spi.views.SpiTableDescriptor
-import akka.runtime.sdk.spi.views.SpiTableUpdateEffect
-import akka.runtime.sdk.spi.views.SpiTableUpdateEnvelope
-import akka.runtime.sdk.spi.views.SpiTableUpdateHandler
-import akka.runtime.sdk.spi.views.SpiType
-import akka.runtime.sdk.spi.views.SpiType.SpiClass
-import akka.runtime.sdk.spi.views.SpiType.SpiField
-import akka.runtime.sdk.spi.views.SpiType.SpiList
-import akka.runtime.sdk.spi.views.SpiViewDescriptor
+import akka.runtime.sdk.spi.QueryDescriptor
+import akka.runtime.sdk.spi.SpiSchema
+import akka.runtime.sdk.spi.TableDescriptor
+import akka.runtime.sdk.spi.SpiTableUpdateHandler.SpiTableUpdateEffect
+import akka.runtime.sdk.spi.SpiTableUpdateHandler.SpiTableUpdateEnvelope
+import akka.runtime.sdk.spi.SpiTableUpdateHandler
+import akka.runtime.sdk.spi.SpiSchema.SpiClass
+import akka.runtime.sdk.spi.SpiSchema.SpiField
+import akka.runtime.sdk.spi.SpiSchema.SpiList
+import akka.runtime.sdk.spi.ViewDescriptor
 import org.slf4j.LoggerFactory
 import org.slf4j.MDC
 
@@ -51,7 +52,7 @@ private[impl] object ViewDescriptorFactory {
 
   val TableNamePattern: Regex = """FROM\s+`?([A-Za-z][A-Za-z0-9_]*)""".r
 
-  def apply(viewClass: Class[_], serializer: JsonSerializer, userEc: ExecutionContext): SpiViewDescriptor = {
+  def apply(viewClass: Class[_], serializer: JsonSerializer, userEc: ExecutionContext): ViewDescriptor = {
     val componentId = ComponentDescriptorFactory.readComponentIdIdValue(viewClass)
 
     val tableUpdaters =
@@ -60,7 +61,7 @@ private[impl] object ViewDescriptorFactory {
     val allQueryMethods = extractQueryMethods(viewClass)
     val allQueryStrings = allQueryMethods.map(_.queryString)
 
-    val tables: Seq[SpiTableDescriptor] =
+    val tables: Seq[TableDescriptor] =
       tableUpdaters
         .map { tableUpdaterClass =>
           // View class type parameter declares table type
@@ -110,7 +111,7 @@ private[impl] object ViewDescriptorFactory {
             throw new IllegalStateException(s"Table updater [${tableUpdaterClass}] is missing a @Consume annotation")
         }
 
-    new SpiViewDescriptor(
+    new ViewDescriptor(
       componentId,
       viewClass.getName,
       tables,
@@ -119,7 +120,7 @@ private[impl] object ViewDescriptorFactory {
       componentOptions = new ComponentOptions(None, None))
   }
 
-  private case class QueryMethod(descriptor: SpiQueryDescriptor, queryString: String)
+  private case class QueryMethod(descriptor: QueryDescriptor, queryString: String)
 
   private def validQueryMethod(method: Method): Boolean =
     method.getAnnotation(classOf[Query]) != null && (method.getReturnType == classOf[
@@ -169,10 +170,10 @@ private[impl] object ViewDescriptorFactory {
         s"Method [${method.getName}] is marked as streaming updates, this requires it to return a ${classOf[
           QueryStreamEffect[_]]}")
 
-    val inputType: Option[SpiType.QueryInput] =
+    val inputType: Option[SpiSchema.QueryInput] =
       method.getGenericParameterTypes.headOption.map(ViewSchema.apply(_)).map {
-        case validInput: SpiType.QueryInput => validInput
-        case other                          =>
+        case validInput: SpiSchema.QueryInput => validInput
+        case other                            =>
           // FIXME let's see if this flies
           // For using primitive parameters directly, using their parameter name as placeholder in the query,
           // we have to make up a valid message with that as a field
@@ -182,7 +183,7 @@ private[impl] object ViewDescriptorFactory {
       }
 
     val outputType = ViewSchema(actualQueryOutputClass) match {
-      case output: SpiType.SpiClass =>
+      case output: SpiClass =>
         if (streamingQuery) new SpiList(output)
         else output
       case _ =>
@@ -191,7 +192,7 @@ private[impl] object ViewDescriptorFactory {
     }
 
     QueryMethod(
-      new SpiQueryDescriptor(
+      new QueryDescriptor(
         method.getName,
         queryStr,
         inputType,
@@ -208,7 +209,7 @@ private[impl] object ViewDescriptorFactory {
       tableType: SpiClass,
       tableName: String,
       serializer: JsonSerializer,
-      userEc: ExecutionContext): SpiTableDescriptor = {
+      userEc: ExecutionContext): TableDescriptor = {
     val annotation = tableUpdater.getAnnotation(classOf[Consume.FromServiceStream])
 
     val updaterMethods = tableUpdater.getMethods.toIndexedSeq
@@ -220,7 +221,7 @@ private[impl] object ViewDescriptorFactory {
       .filterNot(ComponentDescriptorFactory.hasHandleDeletes)
       .filter(ComponentDescriptorFactory.hasUpdateEffectOutput)
 
-    new SpiTableDescriptor(
+    new TableDescriptor(
       tableName,
       tableType,
       new ConsumerSource.ServiceStreamSource(annotation.service(), annotation.id(), annotation.consumerGroup()),
@@ -246,7 +247,7 @@ private[impl] object ViewDescriptorFactory {
       tableType: SpiClass,
       tableName: String,
       serializer: JsonSerializer,
-      userEc: ExecutionContext): SpiTableDescriptor = {
+      userEc: ExecutionContext): TableDescriptor = {
 
     val annotation = tableUpdater.getAnnotation(classOf[Consume.FromEventSourcedEntity])
 
@@ -262,7 +263,7 @@ private[impl] object ViewDescriptorFactory {
     // FIXME input type validation? (does that happen elsewhere?)
     // FIXME method output vs table type validation? (does that happen elsewhere?)
 
-    new SpiTableDescriptor(
+    new TableDescriptor(
       tableName,
       tableType,
       new ConsumerSource.EventSourcedEntitySource(
@@ -289,7 +290,7 @@ private[impl] object ViewDescriptorFactory {
       tableType: SpiClass,
       tableName: String,
       serializer: JsonSerializer,
-      userEc: ExecutionContext): SpiTableDescriptor = {
+      userEc: ExecutionContext): TableDescriptor = {
     val annotation = tableUpdater.getAnnotation(classOf[Consume.FromTopic])
 
     val updaterMethods = tableUpdater.getMethods.toIndexedSeq
@@ -301,7 +302,7 @@ private[impl] object ViewDescriptorFactory {
     // FIXME input type validation? (does that happen elsewhere?)
     // FIXME method output vs table type validation? (does that happen elsewhere?)
 
-    new SpiTableDescriptor(
+    new TableDescriptor(
       tableName,
       tableType,
       new ConsumerSource.TopicSource(annotation.value(), annotation.consumerGroup()),
@@ -321,7 +322,7 @@ private[impl] object ViewDescriptorFactory {
       tableType: SpiClass,
       tableName: String,
       serializer: JsonSerializer,
-      userEc: ExecutionContext): SpiTableDescriptor = {
+      userEc: ExecutionContext): TableDescriptor = {
     val annotation = tableUpdater.getAnnotation(classOf[Consume.FromKeyValueEntity])
 
     val updaterMethods = tableUpdater.getMethods.toIndexedSeq
@@ -345,7 +346,7 @@ private[impl] object ViewDescriptorFactory {
       .filterNot(ComponentDescriptorFactory.hasHandleDeletes)
       .filter(ComponentDescriptorFactory.hasUpdateEffectOutput)
 
-    new SpiTableDescriptor(
+    new TableDescriptor(
       tableName,
       tableType,
       new ConsumerSource.KeyValueEntitySource(ComponentDescriptorFactory.readComponentIdIdValue(annotation.value())),
@@ -462,9 +463,9 @@ private[impl] object ViewDescriptorFactory {
               throw ViewException(componentId, "updateState with null state is not allowed.", None)
             }
             val bytesPayload = serializer.toBytes(newState)
-            new SpiTableUpdateEffect.UpdateRow(bytesPayload)
-          case ViewEffectImpl.Delete => SpiTableUpdateEffect.DeleteRow
-          case ViewEffectImpl.Ignore => SpiTableUpdateEffect.IgnoreUpdate
+            new spi.SpiTableUpdateHandler.UpdateRow(bytesPayload)
+          case ViewEffectImpl.Delete => SpiTableUpdateHandler.DeleteRow
+          case ViewEffectImpl.Ignore => SpiTableUpdateHandler.IgnoreUpdate
         }
       } finally {
         if (addedToMDC) MDC.remove(Telemetry.TRACE_ID)

akka-javasdk/src/main/scala/akka/javasdk/impl/view/ViewSchema.scala

@@ -5,16 +5,22 @@
 package akka.javasdk.impl.view
 
 import akka.annotation.InternalApi
-import akka.runtime.sdk.spi.views.SpiType
-import akka.runtime.sdk.spi.views.SpiType.SpiBoolean
-import akka.runtime.sdk.spi.views.SpiType.SpiByteString
-import akka.runtime.sdk.spi.views.SpiType.SpiDouble
-import akka.runtime.sdk.spi.views.SpiType.SpiFloat
-import akka.runtime.sdk.spi.views.SpiType.SpiInteger
-import akka.runtime.sdk.spi.views.SpiType.SpiLong
-import akka.runtime.sdk.spi.views.SpiType.SpiNestableType
-import akka.runtime.sdk.spi.views.SpiType.SpiString
-import akka.runtime.sdk.spi.views.SpiType.SpiTimestamp
+import akka.runtime.sdk.spi.SpiSchema.SpiType
+import akka.runtime.sdk.spi.SpiSchema.SpiBoolean
+import akka.runtime.sdk.spi.SpiSchema.SpiByteString
+import akka.runtime.sdk.spi.SpiSchema.SpiClass
+import akka.runtime.sdk.spi.SpiSchema.SpiClassRef
+import akka.runtime.sdk.spi.SpiSchema.SpiDouble
+import akka.runtime.sdk.spi.SpiSchema.SpiEnum
+import akka.runtime.sdk.spi.SpiSchema.SpiField
+import akka.runtime.sdk.spi.SpiSchema.SpiFloat
+import akka.runtime.sdk.spi.SpiSchema.SpiInteger
+import akka.runtime.sdk.spi.SpiSchema.SpiList
+import akka.runtime.sdk.spi.SpiSchema.SpiLong
+import akka.runtime.sdk.spi.SpiSchema.SpiNestableType
+import akka.runtime.sdk.spi.SpiSchema.SpiOptional
+import akka.runtime.sdk.spi.SpiSchema.SpiString
+import akka.runtime.sdk.spi.SpiSchema.SpiTimestamp
 
 import java.lang.reflect.AccessFlag
 import java.lang.reflect.ParameterizedType
@@ -58,7 +64,7 @@ private[view] object ViewSchema {
             case c: Class[_]          => c
             case p: ParameterizedType => p.getRawType.asInstanceOf[Class[_]]
           }
-          if (seenClasses.contains(clazz)) new SpiType.SpiClassRef(clazz.getName)
+          if (seenClasses.contains(clazz)) new SpiClassRef(clazz.getName)
           else
             knownConcreteClasses.get(clazz) match {
               case Some(found) => found
@@ -67,23 +73,20 @@ private[view] object ViewSchema {
                 if (clazz.isArray && clazz.componentType() == classOf[java.lang.Byte]) {
                   SpiByteString
                 } else if (clazz.isEnum) {
-                  new SpiType.SpiEnum(clazz.getName)
+                  new SpiEnum(clazz.getName)
                 } else {
                   currentType match {
                     case p: ParameterizedType if clazz == classOf[Optional[_]] =>
-                      new SpiType.SpiOptional(
-                        loop(p.getActualTypeArguments.head, seenClasses).asInstanceOf[SpiNestableType])
+                      new SpiOptional(loop(p.getActualTypeArguments.head, seenClasses).asInstanceOf[SpiNestableType])
                     case p: ParameterizedType if classOf[java.util.Collection[_]].isAssignableFrom(clazz) =>
-                      new SpiType.SpiList(
-                        loop(p.getActualTypeArguments.head, seenClasses).asInstanceOf[SpiNestableType])
+                      new SpiList(loop(p.getActualTypeArguments.head, seenClasses).asInstanceOf[SpiNestableType])
                     case _: Class[_] =>
                       val seenIncludingThis = seenClasses + clazz
-                      new SpiType.SpiClass(
+                      new SpiClass(
                         clazz.getName,
                         clazz.getDeclaredFields
                           .filterNot(f => f.accessFlags().contains(AccessFlag.STATIC))
-                          .map(field =>
-                            new SpiType.SpiField(field.getName, loop(field.getGenericType, seenIncludingThis)))
+                          .map(field => new SpiField(field.getName, loop(field.getGenericType, seenIncludingThis)))
                           .toSeq)
                   }
                 }

akka-javasdk/src/test/scala/akka/javasdk/impl/view/ViewDescriptorFactorySpec.scala

@@ -12,12 +12,12 @@ import akka.javasdk.testmodels.view.ViewTestModels
 import akka.runtime.sdk.spi.ConsumerSource
 import akka.runtime.sdk.spi.Principal
 import akka.runtime.sdk.spi.ServiceNamePattern
-import akka.runtime.sdk.spi.views.SpiType.SpiClass
-import akka.runtime.sdk.spi.views.SpiType.SpiInteger
-import akka.runtime.sdk.spi.views.SpiType.SpiList
-import akka.runtime.sdk.spi.views.SpiType.SpiString
-import akka.runtime.sdk.spi.views.SpiType.SpiTimestamp
-import akka.runtime.sdk.spi.views.SpiViewDescriptor
+import akka.runtime.sdk.spi.SpiSchema.SpiClass
+import akka.runtime.sdk.spi.SpiSchema.SpiInteger
+import akka.runtime.sdk.spi.SpiSchema.SpiList
+import akka.runtime.sdk.spi.SpiSchema.SpiString
+import akka.runtime.sdk.spi.SpiSchema.SpiTimestamp
+import akka.runtime.sdk.spi.ViewDescriptor
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpec
 
@@ -28,7 +28,7 @@ class ViewDescriptorFactorySpec extends AnyWordSpec with Matchers {
   import ViewTestModels._
   import akka.javasdk.testmodels.subscriptions.PubSubTestModels._
 
-  def assertDescriptor[T](test: SpiViewDescriptor => Any)(implicit tag: ClassTag[T]): Unit = {
+  def assertDescriptor[T](test: ViewDescriptor => Any)(implicit tag: ClassTag[T]): Unit = {
     test(ViewDescriptorFactory(tag.runtimeClass, new JsonSerializer, ExecutionContexts.global()))
   }
 

akka-javasdk/src/test/scala/akka/javasdk/impl/view/ViewSchemaSpec.scala

@@ -5,20 +5,20 @@
 package akka.javasdk.impl.view
 
 import akka.javasdk.testmodels.view.ViewTestModels
-import akka.runtime.sdk.spi.views.SpiType.SpiBoolean
-import akka.runtime.sdk.spi.views.SpiType.SpiByteString
-import akka.runtime.sdk.spi.views.SpiType.SpiClass
-import akka.runtime.sdk.spi.views.SpiType.SpiClassRef
-import akka.runtime.sdk.spi.views.SpiType.SpiDouble
-import akka.runtime.sdk.spi.views.SpiType.SpiEnum
-import akka.runtime.sdk.spi.views.SpiType.SpiField
-import akka.runtime.sdk.spi.views.SpiType.SpiFloat
-import akka.runtime.sdk.spi.views.SpiType.SpiInteger
-import akka.runtime.sdk.spi.views.SpiType.SpiList
-import akka.runtime.sdk.spi.views.SpiType.SpiLong
-import akka.runtime.sdk.spi.views.SpiType.SpiOptional
-import akka.runtime.sdk.spi.views.SpiType.SpiString
-import akka.runtime.sdk.spi.views.SpiType.SpiTimestamp
+import akka.runtime.sdk.spi.SpiSchema.SpiBoolean
+import akka.runtime.sdk.spi.SpiSchema.SpiByteString
+import akka.runtime.sdk.spi.SpiSchema.SpiClass
+import akka.runtime.sdk.spi.SpiSchema.SpiClassRef
+import akka.runtime.sdk.spi.SpiSchema.SpiDouble
+import akka.runtime.sdk.spi.SpiSchema.SpiEnum
+import akka.runtime.sdk.spi.SpiSchema.SpiField
+import akka.runtime.sdk.spi.SpiSchema.SpiFloat
+import akka.runtime.sdk.spi.SpiSchema.SpiInteger
+import akka.runtime.sdk.spi.SpiSchema.SpiList
+import akka.runtime.sdk.spi.SpiSchema.SpiLong
+import akka.runtime.sdk.spi.SpiSchema.SpiOptional
+import akka.runtime.sdk.spi.SpiSchema.SpiString
+import akka.runtime.sdk.spi.SpiSchema.SpiTimestamp
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpec
 

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-cb36dd2e")
+    val RuntimeVersion = sys.props.getOrElse("kalix-runtime.version", "1.3.0-645b7b0")
   }
   // NOTE: embedded SDK should have the AkkaVersion aligned, when updating RuntimeVersion, make sure to check
   // if AkkaVersion and AkkaHttpVersion are aligned