Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: adding class name to descriptors #116

Merged
merged 2 commits into from
Dec 20, 2024
Merged

chore: adding class name to descriptors #116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a8914ac
chore: adding class name to descriptors
aludwiko Dec 20, 2024
678a4bb
runtime version bump
aludwiko Dec 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion akka-javasdk-maven/akka-javasdk-parent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-98fe2a3</kalix-runtime.version>
<kalix-runtime.version>1.3.0-cb36dd2e</kalix-runtime.version>

<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<skip.docker>false</skip.docker>
Expand Down
8 changes: 5 additions & 3 deletions akka-javasdk/src/main/scala/akka/javasdk/impl/SdkRunner.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -450,7 +450,7 @@ private final class Sdk(
})
}
eventSourcedEntityDescriptors :+=
new EventSourcedEntityDescriptor(componentId, readOnlyCommandNames, instanceFactory)
new EventSourcedEntityDescriptor(componentId, clz.getName, readOnlyCommandNames, instanceFactory)

case clz if classOf[KeyValueEntity[_]].isAssignableFrom(clz) =>
val componentId = clz.getAnnotation(classOf[ComponentId]).value
Expand All @@ -475,7 +475,7 @@ private final class Sdk(
})
}
keyValueEntityDescriptors :+=
new EventSourcedEntityDescriptor(componentId, readOnlyCommandNames, instanceFactory)
new EventSourcedEntityDescriptor(componentId, clz.getName, readOnlyCommandNames, instanceFactory)

case clz if Reflect.isWorkflow(clz) =>
val componentId = clz.getAnnotation(classOf[ComponentId]).value
Expand All @@ -491,6 +491,7 @@ private final class Sdk(
workflowDescriptors :+=
new WorkflowDescriptor(
componentId,
clz.getName,
readOnlyCommandNames,
ctx => workflowInstanceFactory(ctx, clz.asInstanceOf[Class[Workflow[Nothing]]]))

Expand All @@ -509,7 +510,7 @@ private final class Sdk(
serializer,
ComponentDescriptor.descriptorFor(timedActionClass, serializer))
timedActionDescriptors :+=
new TimedActionDescriptor(componentId, timedActionSpi)
new TimedActionDescriptor(componentId, clz.getName, timedActionSpi)

case clz if classOf[Consumer].isAssignableFrom(clz) =>
val componentId = clz.getAnnotation(classOf[ComponentId]).value
Expand All @@ -529,6 +530,7 @@ private final class Sdk(
consumerDescriptors :+=
new ConsumerDescriptor(
componentId,
clz.getName,
consumerSource(consumerClass),
consumerDestination(consumerClass),
timedActionSpi)
Expand Down
1 change: 1 addition & 0 deletions akka-javasdk/src/main/scala/akka/javasdk/impl/view/ViewDescriptorFactory.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ private[impl] object ViewDescriptorFactory {

new SpiViewDescriptor(
componentId,
viewClass.getName,
tables,
queries = allQueryMethods.map(_.descriptor),
// FIXME reintroduce ACLs (does JWT make any sense here? I don't think so)
Expand Down
2 changes: 1 addition & 1 deletion project/Dependencies.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-98fe2a3")
val RuntimeVersion = sys.props.getOrElse("kalix-runtime.version", "1.3.0-cb36dd2e")
}
// NOTE: embedded SDK should have the AkkaVersion aligned, when updating RuntimeVersion, make sure to check
// if AkkaVersion and AkkaHttpVersion are aligned
Expand Down
Loading